-----BEGIN PGP SIGNATURE-----
iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ1IssQAKCRDorT+BmrEO
eICmAJ4ucooPI46WmQPpM0P59O1mMg6tTQCeN/GI0UvgsQkpgB52QWP9VGXeRg8=
=mAzQ
-----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
iQJLBAABCgA1FiEEHrBYPudH862glXQBzJUERRm+ZmkFAmdYixgXHG1rYmVzdGFz
QGxpbmVhZ2Vvcy5vcmcACgkQzJUERRm+ZmntQQ/+OQD/4KTpBaQOM+hYmZv2al28
wZ2EDbuGZcdUIj9o6kgl2x5DJGv7AJ3tZZ5/WKTvAsxVkZ4oISMrR6WkE/kysIaV
HGiX3JaM8t1bdAbD6HGq7I4KwS2UUTdUJMc9TUSQkT74QwAfhwAwxVM6Yw9CxQUG
V5nLtYhDj3un9Xb1amiJaV3Mof+Nw/q0d1A3kpc1qH2Ul56f4COnAysa1GPiDrB3
eHssxIrAhf5+E3Vk5rN+sdoWTVLa9JdOGx4pSQNBnkBwT2HD8FpysVVN4L9DvwwN
pG6U7pNN5uzPZ1HyQT8D71Y0tDRaX/mT38doPoa0u1shmiBBbMU87vl2woiEAATQ
0UHI/ZcY9Q8yX1iA08a6raK7VAedxmierfNMTtp2nyMJmoTe818u/WVAYfFYrjYZ
i5bM0PtAANnQ/6elWC4C57usyLuPcUg4C7cKqPfXerfopEsi8e1v/wHjjyeQhCIK
xSk11uwD26CgBxkitktn6dySmVhapnqEM53/1bQ8OWcxhlRQjE5019/SpNYysVzD
Q8ef4Xu2on6NlwfNmicKymvOvIbugnKhl6i4iK9UKMaKmZ/cArpk0/OWu3yHy5OK
9AZozQHwbF2kwZLHakK9QSxtwgiRBhqLGttu3tsf1+4NDuuCTlj25BwcJgXoF5+7
Wn7EaVThxf3pkDrYNcE=
=6ce+
-----END PGP SIGNATURE-----
Merge tag 'android-15.0.0_r6' into staging/lineage-22.0_merge-android-15.0.0_r6
Android 15.0.0 Release 6 (AP4A.241205.013)
# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ1IssQAKCRDorT+BmrEO
# eICmAJ4ucooPI46WmQPpM0P59O1mMg6tTQCeN/GI0UvgsQkpgB52QWP9VGXeRg8=
# =mAzQ
# -----END PGP SIGNATURE-----
# gpg: Signature made Fri Dec 6 00:44:01 2024 EET
# gpg: using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [marginal]
# gpg: initial-contribution@android.com: Verified 2457 signatures in the past
# 3 years. Encrypted 4 messages in the past 2 years.
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg: It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 4340 D135 70EF 945E 8381 0964 E8AD 3F81 9AB1 0E78
# By Spandan Das (55) and others
# Via Automerger Merge Worker (1031) and others
* tag 'android-15.0.0_r6': (554 commits)
Revert^3 "Use -target-feature for MTE"
Enforce exclusive release config component directories
Possible fix for stat error during globbing
Remove `prebuilt_apex_module_creator` mutator
Revert "pass read new storage parameter to java codegen"
Temporarily bypass apex availability check for /product apexes with a specific prefix
Remove the internal extractor module created by apex_set
Remove the internal selector module created by prebuilt_apex
pass read new storage parameter to java codegen
Add an incremental parity test.
Remove internal deapexer module
Remove deapex support from java_*_import
Revert^2 "Remove java_sdk_library "magic""
Revert^2 "Restrict java_sdk_library in libs of java_import and droidstubs modules"
Revert^2 "Restrict java_sdk_library in libs"
Revert "Remove java_sdk_library "magic""
Revert "Restrict java_sdk_library in libs of java_import and dro..."
Revert "Restrict java_sdk_library in libs"
Fixes host_required_modules for test_module_config
Add some log to the build action caching test.
...
Conflicts:
android/Android.bp
android/androidmk.go
android/config.go
android/defaults.go
android/module.go
android/module_context.go
android/neverallow.go
android/product_config.go
android/sdk.go
android/variable.go
apex/apex.go
cc/binary_sdk_member.go
cc/cc.go
cc/compiler.go
cc/library.go
cc/library_sdk_member.go
cc/linker.go
cc/object.go
java/java.go
scripts/gen_build_prop.py
snapshot/host_fake_snapshot.go
snapshot/host_snapshot.go
Change-Id: I036e0ef3652f680f194dcf11e5a36844bd527221
Incremental version is used in various places to invalidate caches.
Setting BUILD_NUMBER directly causes unnecessary rebuilds due to
environment variable changes, so simply set it to Unix epoch unless
BUILD_NUMBER is explicitly set.
Change-Id: Id590df48ae1b73b63039f185644103d66a4bbbb3
The format of the overrides is KEY=VALUE
Where KEY is one of the dict keys used in config
https://cs.android.com/android/platform/superproject/main/+/main:build/soong/scripts/gen_build_prop.py
And VALUE is the value you want take over.
An example:
PRODUCT_BUILD_PROP_OVERRIDES += \
BuildDesc="jfltevzw-user 4.2.2 JDQ39 I545VRUAMDK release-keys" \
BuildFingerprint=Verizon/jfltevzw/jfltevzw:4.2.2/JDQ39/I545VRUAMDK:user/release-keys \
DeviceName=jfltevzw \
DeviceProduct=jfltevzw \
SystemDevice=jfltevzw \
SystemName=jfltevzw
Change-Id: Ib44a3bb573d08d492acc092e104cb4f687f3b168
As some partitions have build.prop under etc/, this change adds
relative_install_path property to build_prop module. Also this change
adds system_ext related Soong variables and system_ext support in
gen_build_prop.py.
Bug: 322090587
Test: build and compare system_ext/etc/build.prop
Change-Id: I416662b8bae09383af0cdd3d8444a5c300006b7b
This reverts commit 7b7593968b.
Reason for revert: fixed breakage with aosp/3200730, verified with ABTD
Change-Id: I83a4cb1a39bce1a1da8fabd49c6c895862a6c686
build_prop is a soong module generating {partition}/build.prop. It's
ported from build/make/core/sysprop.mk and will replace sysprop.mk in
the future. Currently used only by Android.bp cuttlefish system image.
Bug: 322090587
Bug: 346214958
Test: compare system/build.prop and aosp_cf_x86_64_system-build.prop for
eng / user / userdebug
Change-Id: Iad76139fe86ec4f582218c185aa15baeacaa38dc
Many parameters can be migrated to product_config module. This is also a
PoC, which is helpful for future build.prop migration.
Bug: 346214955
Test: compare buildinfo.prop before and after
Change-Id: I751220b3a09583e469ae721c0e49a1909b6428d7
product_config module will export productVariables struct (defined in
android/variable.go). Other modules can depend on product_Config module
to read product variables, without needing to update Soong.
Bug: 346214955
Test: build and see output of product_config module
Change-Id: I06e1d2716dc2a8b90984bb46c5fc901cd1ca5020
Fixes:
Error: out/target/common/obj/JAVA_LIBRARIES/org.ifaa.android.manager_intermediates/classes.jar
contains class file org/ifaa/android/manager/IFAAManager.class,
whose package name org.ifaa.android.manager is not in the whitelist
build/make/core/tasks/check_boot_jars/package_whitelist.txt
of packages allowed on the bootclasspath.
(The error only pops up when using "make dist")
Change-Id: Ib17b935ca39de7f6e8e6b68aa81fbebe1d5a30a5
B58: Add org.codeaurora.ims to the list.
Bug: 192690464
Change-Id: I0837873f5bf4e3a8402d70e720d2b55ee4e0a991
(cherry picked from commit ef25c8777180f88650dad8bd2499e8c8c9d174b7)
So if a partner gets this error they can find the script and see
links to documentation.
Test: Presubmits
Change-Id: I50cbe4770e9619fb67a7a586fa6d2210c67d4650
Manifests may now have multiple copies of elements if they are
disambiguated with android:featureFlag attributes. Remove the
restrictions on duplicate elements from manifest_check.py and
manifest_fixer.py, and instead iterate over all matching elements.
Test: manifest_check_test.py, manifest_fixer_test.py
Bug: 365170653
Flag: EXEMPT bugfix
Change-Id: Ib577439d03a808a20a5fcc3e15a3117e0970d729
Fix a few warnings showing up in manifest_*.py
Test: manifest_fixer_test.py
Test: manifest_check_test.py
Flag: EXEMPT refactor
Change-Id: I144100d6d4aa7f5dff7eec79b4bd2d9d5da52153
Support long classpaths by passing the classpath in a file to the script
that generates build.xml.
Bug: 308016794
Test: builds
Flag: EXEMPT refactor
Change-Id: Ib238a83a26acba7ede8e55298397dbeb9a57a866
As some partitions have build.prop under etc/, this change adds
relative_install_path property to build_prop module. Also this change
adds system_ext related Soong variables and system_ext support in
gen_build_prop.py.
Bug: 322090587
Test: build and compare system_ext/etc/build.prop
Change-Id: I416662b8bae09383af0cdd3d8444a5c300006b7b
* changes:
Revert^6 "Use Soong-built system/build.prop"
Revert^6 "Sync gen_build_prop.py to sysprop.mk"
Revert^2 "Conditionally pass kernel version to build.prop"
Revert^6 "Add TARGET_SYSTEM_PROP to system build.prop"
Revert "Revert "Revert^2 "Set output for build_prop even on Soon..."
This reverts commit 7b7593968b.
Reason for revert: fixed breakage with aosp/3200730, verified with ABTD
Change-Id: I83a4cb1a39bce1a1da8fabd49c6c895862a6c686
