summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-07-04Merge tag 'LA.QSSI.13.0.r1-10700-qssi.0' into tachibana-mr1tachibana-mr1alk3pInjection
"LA.QSSI.13.0.r1-10700-qssi.0" Conflicts: ui/build/dumpvars.go Change-Id: I78c34da9d4eb1cd233b776d6fab952f912439d5c
2023-06-23Merge 980b1c84277d8ba3335a2a6f6938b841d09ae60a on remote branchLinux Build Service Account
Change-Id: Ic928034984dee3b9211a7d7150c50b698eb772a9
2023-06-15Snap for 10323517 from b243ee3ef36ad1108ee05c90822fff57e0144270 to ↵Android Build Coastguard Worker
t-keystone-qcom-release Change-Id: Ib8679cb2de0d372fca05ebac71d11616a6126372
2023-06-09Merge t-qpr-2023-06Matt Lee
Change-Id: Iac1db8f24ec1804e59cc032caedea8cc185fcb82
2023-06-08Snap for 10276566 from c7a1c7bd40d8e702d2e00635178699e5ac1a17c4 to ↵Android Build Coastguard Worker
tm-platform-release Change-Id: I976ce8e4ad23cb2216339d36aed8c3a768f71a3a
2023-06-03DO NOT MERGE - Merge tm-qpr3-release TQ3A.230605.010 into tm-platform-mergeAndy Quan
Ignore-AOSP-First: bulk merge from tm-qpr3-release Bug: 279962103 Signed-off-by: Andy Quan <andyq@google.com> Change-Id: I01bf406252954f82033edd760f0e0979fd3d05d1
2023-04-20Merge tag 'LA.QSSI.13.0.r1-09800-qssi.0' into tachibanatachibanaalk3pInjection
"LA.QSSI.13.0.r1-09800-qssi.0" Change-Id: If5115134fea6c667ca1b5c8f50861ef9e3398842
2023-04-13Merge e63c47c1e746e17332d16c67db7ae0241effb44e on remote branchLinux Build Service Account
Change-Id: I20797bd3da4b2e010c041b3d3cad23cf9094fef8
2023-03-28Snap for 9839085 from 82747779baa334116d0337fb13edd1c0fdca5324 to ↵Android Build Coastguard Worker
tm-qpr3-release Change-Id: I9b63cedbb3bbe6867ee700420d2d698c2f657d20
2023-03-23Snap for 9798568 from ee181be03f0da2d752b6b31d4c698026b41c7f44 to ↵Android Build Coastguard Worker
t-keystone-qcom-release Change-Id: I0f36625663cb762e7038e6e76b08c2d5a8e13d12
2023-03-15Create a new product variable to gate blueprint filesSpandan Das
Bug: 270654958 Users can use this feature by 1. Setting PRODUCT_INCLUDE_TAGS += <val> in their product mk files 2. Set ``` blueprint_packge_includes { match_al: ["<val>"], } other_module_type {name: foo} other_module_type {name: bar} ``` bar and foo will be included if and only if <val> is set Test: Unit tests in blueprint Test: TH Change-Id: I32eed4e3b5ac47fb565c62d13d8881fa984c86f4 Merged-In: I32eed4e3b5ac47fb565c62d13d8881fa984c86f4 (cherry picked from commit b45fbfbabe69d368d50e149ab37da3476a431a96)
2023-03-08Snap for 9704301 from 8ab8056a4f9de6cec1fdedc7d49502439ea7aef6 to ↵Android Build Coastguard Worker
tm-qpr3-release Change-Id: I6c90789769748ae56a1a6e5074a624046b30fff4
2023-03-07java_sdk_library_import: Copy all prebuilt properties to child modulesPaul Duffin
Previously, only the prefer property was copied from the java_sdk_library_import module to its child modules which meant that if the use_source_config_var property was used to control the prefer property that the child modules would never be used. That can cause build breakages when building against prebuilts as some parts of the build will use prebuilt files from java_sdk_library_import and some will use source files from the corresponding java_sdk_library. This change copies the use_source_config_var property too. It also adds tests to verify that dependencies on child modules of a java_sdk_library use the prebuilt child modules of the corresponding java_sdk_library_import. That revealed a bug with the handling of stub sources where the prefer property was set after creating the module which has also been fixed. Bug: 249192297 Test: m nothing # Cherry pick into branch broken by previous behavior and make # sure that it fixes it. Change-Id: I5719c257f8457bcb2238bc7965215512a20f1095 (cherry picked from commit on android-review.googlesource.com host: bf4de041de611de4b3ec24c5f261c4293522961a) Merged-In: I5719c257f8457bcb2238bc7965215512a20f1095
2023-03-02Merge t-qpr-2023-03Matt Lee
Change-Id: I61ec429dddae7971efe2a62fd5f1c173a896ee15
2023-02-22Snap for 9635940 from 99a750fbb46bd6acc2c1417515dfbd753830ad6f to ↵Android Build Coastguard Worker
tm-platform-release Change-Id: I745bae95357e16665475e65e58f711d4db4593f6
2023-02-17Snap for 9618620 from 144be1f8aa798fc7f00004ab76db93b955880e32 to ↵Android Build Coastguard Worker
tm-qpr3-release Change-Id: I0f30f27f56ea943570ed0db337c6fd7cc90ce93c
2023-02-16DO NOT MERGE - Merge tm-qpr2-release into tm-platform-mergeAndy Quan
Bug: 269346300 Change-Id: I58d38a1f0fe2191102e70d43be3e90d6f690d301
2023-02-16Ignore native bridge archs for apex selectionAnton Hansson
This leads to an arm64 apex being used on a device that is mixed x86_64 with nativebridge=arm64. A device like that doesn't appear to work with arm64 binaries. For example, the boringssl-self-check binary crashes on boot. Bug: 260115309 Bug: 268224524 Test: unit test Test: boot emulator with this combination Change-Id: Ic4a91974290a05b1799f755fcf52ef226d68f4c2 (cherry picked from commit 805e0a53ef53299878643dffbb7641c21892bcfe) Merged-In: Ic4a91974290a05b1799f755fcf52ef226d68f4c2
2023-02-16extract_apks matches APKs with >= 1 matching ABISam Delmerico
Prior to this change, the bundletool and extract_apks tools require that all ABIs that an APEX or APK provides must be compatible with the TargetConfig. Instead, this change allows an APK to be selected if it has at least one compatible ABI with the TargetConfig. Bug: 260115309 Bug: 269311816 Test: go test . Change-Id: If67ce8128099611257a834862295a2bf5fa427d3 (cherry picked from commit b48d57bdcdcae3c3eb0b823bdf952d74e5502412) Merged-In: If67ce8128099611257a834862295a2bf5fa427d3
2023-02-14Merge cherrypicks of ['googleplex-android-review.googlesource.com/21142901'] ↵Android Build Coastguard Worker
into tm-qpr2-release. Change-Id: I3466438190b453cf368c7f2869fdd8e39b085d3c
2023-02-14Expose avb_hash_algorithm as a property.Shikha Panwar
When avb_hash_algorithm is set, for filesystem type build targets, add_hashtree_footer will be called with the appropriate --hash_algorithm flag. Bug: 262892300 Test: Build succeeds Merged-In: If2f9c9aa1e98314b3d3e2f8bf25c1bab193f908e Merged-In: Ief4b0f0fd89ebf64b45b29962a3811698bc922d6 Change-Id: I3bf5aecbfd717036a5b167696b107ee6cb1830b4 (cherry picked from commit f3d1e8c24cba69b93d9fdd2f01d770927988eeb1) Merged-In: I3bf5aecbfd717036a5b167696b107ee6cb1830b4
2023-02-07Snap for 9570005 from 9b556723b6e8581b99c14ba7f997cfd31378d7e1 to ↵Android Build Coastguard Worker
tm-qpr3-release Change-Id: I8a7c0fd97c610cdbdf4752d253b2d701646349e1
2023-02-06Merge "Revert^3 "Revert "update MultiAbiTargeting matching logic""" into ↵Bob Hanji
tm-qpr-dev
2023-02-05Snap for 9564311 from 288d7b1d1f6457c5a4337a904f4f99529a9a87ad to ↵Android Build Coastguard Worker
tm-qpr3-release Change-Id: I357bbd9fe47e1fb9cf712fa195ce767daa81610e
2023-02-04Merge cherrypicks of ['googleplex-android-review.googlesource.com/20884129'] ↵Android Build Coastguard Worker
into tm-qpr2-release. Change-Id: Ia3b7bbe2eea52628c01f2c54b39d06f798ff2445
2023-02-04Revert^3 "Revert "update MultiAbiTargeting matching logic""Bob Hanji
1cc8ed5dee39e5a4c1def3e0304c28d284fb1368 Bug: 263438687 Change-Id: I7d8585c97ca1e9a960d9725135f99579b0ae5762 Merged-In: Ic3b067e98a65146cfa399e7c9b231f397e51c23e (cherry picked from commit dc4f18317d0e296961a5569424f9038296697275) Merged-In: I7d8585c97ca1e9a960d9725135f99579b0ae5762
2023-02-04Expose avb_hash_algorithm as a property. am: f3d1e8c24c am: 99b130a95dShikha Panwar
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/21142901 Change-Id: I3e06cbc0adce11a820624a10c420b0475b23e8c1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-04Expose avb_hash_algorithm as a property. am: f3d1e8c24cShikha Panwar
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/21142901 Change-Id: I803583f5739d487468746ab38720fbe32f96f003 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-03Revert^3 "Revert "update MultiAbiTargeting matching logic""Bob Hanji
1cc8ed5dee39e5a4c1def3e0304c28d284fb1368 Bug: 263438687 Change-Id: I7d8585c97ca1e9a960d9725135f99579b0ae5762 Merged-In: Ic3b067e98a65146cfa399e7c9b231f397e51c23e
2023-01-31Expose avb_hash_algorithm as a property.Shikha Panwar
When avb_hash_algorithm is set, for filesystem type build targets, add_hashtree_footer will be called with the appropriate --hash_algorithm flag. Bug: 262892300 Test: Build succeeds Merged-In: If2f9c9aa1e98314b3d3e2f8bf25c1bab193f908e Merged-In: Ief4b0f0fd89ebf64b45b29962a3811698bc922d6 Change-Id: I3bf5aecbfd717036a5b167696b107ee6cb1830b4
2023-01-30Merge 59fd4966b64f8ccb64adda745015537707ab23fa on remote branchLinux Build Service Account
Change-Id: I380db36901075895aaab02b9380e85ef10aa1af2
2023-01-15Merge 2f36e2d29219744ae4ab5731bc9911f310229936 on remote branchLinux Build Service Account
Change-Id: I1d9889d41e537a00e260ae3015575b4aaafee997
2023-01-10Snap for 9470583 from b813c9c180ba07810110e3369a1ae8015d7e4092 to ↵Android Build Coastguard Worker
tm-qpr3-release Change-Id: I708b068bce63c3bd60353e45c27b7cd71d96aa3a
2023-01-05Snap for 9459315 from 616151ebbfbae6bb1f9cab420e5f3cfb27d71a21 to ↵Android Build Coastguard Worker
t-keystone-qcom-release Change-Id: I23364911269bf0f195d19cd626e4bfe9d1b6018e
2023-01-04Merge t-mpr-2023-01Matt Lee
Change-Id: I8b062b40ae1ee14af30c673143d00dd6ebf11407
2022-12-24Snap for 9434600 from b813c9c180ba07810110e3369a1ae8015d7e4092 to ↵Android Build Coastguard Worker
tm-qpr2-release Change-Id: I8537fd6d135d5856cffd3ea6a0d1ecb208b8d912
2022-12-23Merge "Revert^2 "Revert "update MultiAbiTargeting matching logic""" into ↵Xiaowen Lei
tm-qpr-dev
2022-12-23Snap for 9432151 from 4a6a53a32c1fd1c267060991445ce79741fe8ff9 to ↵Android Build Coastguard Worker
tm-qpr2-release Change-Id: Id6223ee01972f7deabdbab7339ed5658b33bfde1
2022-12-23Revert^2 "Revert "update MultiAbiTargeting matching logic""Xiaowen Lei
be8bf85b03f42663f9771b92860fbfdd8cccd2b6 Change-Id: I70802042e5665baa471a3e9e0bc27efaf7a97944 Merged-In: Ic3b067e98a65146cfa399e7c9b231f397e51c23e
2022-12-22Snap for 9430503 from ce5b8bb13ebbbff5c4fb4ce89a6ac319fde0cf17 to ↵Android Build Coastguard Worker
t-keystone-qcom-release Change-Id: I23c75646512f823a8d3f2cfd76bb8feda19321f8
2022-12-21Merge "Revert "Revert "update MultiAbiTargeting matching logic""" into ↵Bob Hanji
tm-qpr-dev
2022-12-21Revert "Revert "update MultiAbiTargeting matching logic""Artur Satayev
This reverts commit 6c5fae512be51e9d13390b21b7def412ee718b0e. Reason for revert: re-submitting in a topic Fix: b/246476965 Change-Id: I442e34d035da867ba36462f8e714c4d3c655af2f Merged-In: Ic3b067e98a65146cfa399e7c9b231f397e51c23e
2022-12-06Merge t-qpr-2022-12Matt Lee
Change-Id: I2b8d7ca6730eb3be265347d4fb4e6cc04b5e5664
2022-12-07Snap for 9376496 from 94f9f4ec5f1953f1648ec7ddccbb4693a4b13c30 to ↵Android Build Coastguard Worker
tm-qpr2-release Change-Id: Icac918d0fec1b6e2ba0ffd1ec5b7b138851f4c1e
2022-12-06Snap for 9347470 from 0dbbfd37d8f5f06f4283dcab1870671ba7c482df to ↵Android Build Coastguard Worker
tm-platform-release Change-Id: Ic3d4fdd1a6d1e8a3ce89e5640c9a4efe286c89a9
2022-12-06[automerger skipped] Support robolectric zip expectations (similar to ↵Rex Hoffman
command line zip) am: a8033c94db am: 91c22dc45e -s ours am skip reason: Merged-In Id6b2b0bdb7b666a1e598b5451f869bf3d56953e5 with SHA-1 e0c45acc6b is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/20611145 Change-Id: Icd544b1c7bc9c454dd9e149414128518baa4e74b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-06Support robolectric zip expectations (similar to command line zip) am: ↵Rex Hoffman
a8033c94db Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/20611145 Change-Id: I73b97924cd62cf5454766d6a4afa124cb75c93b3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-03Snap for 9364794 from e0c45acc6bb833bbb7cc22de03e6cdb7cc43b499 to ↵Android Build Coastguard Worker
tm-qpr2-release Change-Id: Ie7f55c20f89854c0f708f3e955462036db3fd57a
2022-12-01Support robolectric zip expectations (similar to command line zip)Rex Hoffman
Test: mma in /external/robolectric Bug: 244627502 Change-Id: Id6b2b0bdb7b666a1e598b5451f869bf3d56953e5 Merged-In: Id6b2b0bdb7b666a1e598b5451f869bf3d56953e5
2022-12-01Support robolectric zip expectations (similar to command line zip)Rex Hoffman
Test: mma in /external/robolectric Bug: 244627502 Change-Id: Id6b2b0bdb7b666a1e598b5451f869bf3d56953e5
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-03 03:14:10 +0000