aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* check_boot_jars: Add oplus packages to whitelistHEADu14.0Bruno Martins2024-09-191-0/+3
| | | | Change-Id: I8e467e35f148cfae9b2cc4ae32a26ffbca1984b5
* Add support for keyboard prebuilt module typeyangbill2024-09-192-0/+78
| | | | | | | | | | | | | | | | Add 3 different module type: - prebuilt_usr_keylayout - prebuilt_usr_keychars - prebuilt_usr_idc Bug: 337998675 Test: cd build/soong/etc ; go test -run \ TestPrebuiltPrebuiltUserKeyLayoutInstallDirPath Test: cd build/soong/etc ; go test -run \ TestPrebuiltPrebuiltUserKeyCharsInstallDirPath Test: cd build/soong/etc ; go test -run \ TestPrebuiltPrebuiltUserIdcInstallDirPath Change-Id: I5bafbc48dd0edd0d06783b89b904330a2a30c743
* Add support for prebuilt_usr_hyphendata typeyangbill2024-09-192-0/+26
| | | | | | | Bug: 331551860 Test: cd build/soong/etc ; go test -run \ TestPrebuiltPrebuiltUserHyphenDataInstallDirPath Change-Id: I78d647eea9a84665dd9c78940c51d2fb948c04f8
* soong: whitelist repoJulian Veit2024-07-131-0/+1
| | | | | | Required for changelog generation Change-Id: Ica31e9595e8ab722daac7f5b20f0b500cd7090d1
* Merge tag 'android-14.0.0_r50' of ↵George Zacharia2024-06-30321-6831/+13250
|\ | | | | | | | | | | https://android.googlesource.com/platform/build/soong into u14.0 Android 14.0.0 Release 50 (AP2A.240605.024)
| * [coastguard skipped] Merge sparse cherrypicks from ↵Android Build Coastguard Worker2024-05-030-0/+0
| |\ | | | | | | | | | | | | | | | | | | | | | | | | sparse-11799897-L62100030003582657 into 24Q2-release. COASTGUARD_SKIP: I9d0b0a6d3070dfd1398a3eccbf8677af22f5de2f COASTGUARD_SKIP: I2a66651f935923623bea269aabea7476720573b1 Change-Id: I157a67cd0e7cef1b41460814d03644176aa037be
| | * Merge cherrypicks of ['googleplex-android-review.googlesource.com/27202159'] ↵Android Build Coastguard Worker2024-05-0322-0/+3950
| |/| | | | | | | | | | | | | | | | | | | | | | into sparse-11799897-L62100030003582657. SPARSE_CHANGE: I2a66651f935923623bea269aabea7476720573b1 Change-Id: I9d0b0a6d3070dfd1398a3eccbf8677af22f5de2f
| | * release-config: sync from goog/mainLaMont Jones2024-05-0322-0/+3950
| |/ | | | | | | | | | | | | | | | | | | | | This represents release-config support as of commit 897ab4e0878dc8a5d349699943bd57296755f2f4 Bug: 328495189 Test: manual (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f95b8b0d12ff2d09a696b9cd2c3e8643883cfae6) Merged-In: I2a66651f935923623bea269aabea7476720573b1 Change-Id: I2a66651f935923623bea269aabea7476720573b1
| * Merge cherrypicks of ['googleplex-android-review.googlesource.com/26882242'] ↵Android Build Coastguard Worker2024-04-121-0/+1
| |\ | | | | | | | | | | | | | | | into 24Q2-release. Change-Id: I033c0802185e4a4c18dc5bc97904293bd713c111
| | * Merge "Add secretkeeper-v1-java to platform APIs" into main am: f28b5697b8 ↵Nikolay Elenkov2024-04-121-0/+1
| |/ | | | | | | | | | | | | | | | | | | | | am: 196729ffda Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3003166 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c8170926f66853d4ff38e48c7af4ab9fdf0ae5ae) Merged-In: I6ed203fab98537ae18c51c9def19434acdbf20db Change-Id: I6ed203fab98537ae18c51c9def19434acdbf20db
| * Merge cherrypicks of ['googleplex-android-review.googlesource.com/26459294', ↵Android Build Coastguard Worker2024-03-203-149/+72
| |\ | | | | | | | | | | | | | | | 'googleplex-android-review.googlesource.com/26457742', 'googleplex-android-review.googlesource.com/26620899'] into 24Q2-release. Change-Id: I5f559c1e1d797a855ae09c60043b5c5edcad3654
| | * Create rule to generate the exportable api files when checkapi is disabledJihoon Kang2024-03-201-13/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WITHOUT_CHECK_API environment variable enables the checkapi to be removed from the critical path. The variable is rarely used within AOSP, but the downstream vendors may depend on it, in order to improve the build performance given that the api signature file through metalava is a resource costly task. Currently, the exportable api files / removed api files are not generated when checkapi is disabled, but a module may depend on the exportable api files when a checkapi is disabled. In order to prevent the missing build rules error in this case, generate the rule to copy the checked in api file / removed api file to the exportable api file / removed api file to prevent build errors. This change also fixes the error message when the OutputFiles(string) api file is null, to correctly inform the user the error. Test: m BUILD_FROM_SOURCE_STUB=true WITHOUT_CHECK_API=true && inspect ninja path and verify that "non-updatable-exportable-current.txt" depends on the generated exportable api file. Bug: 329374072 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2d4074a022c0d836c712a6606b5c6e2cb376e07a) Merged-In: I24f88d450fb46b6ea9d5920d83617d8228edd34b Change-Id: I24f88d450fb46b6ea9d5920d83617d8228edd34b
| | * Revert "Additional cleanup prior to adding the runtime stubs"Jihoon Kang2024-03-201-53/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert submission 2929615 Reason for revert: b/328225000 Reverted changes: /q/submissionid:2929615 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:de57c7a324b405fbbfe887b2512afa1845083f2d) Merged-In: I29c605adb9401c9cb8b58646f2ae7b53b9a758e9 Change-Id: I29c605adb9401c9cb8b58646f2ae7b53b9a758e9
| | * Revert "Generate runtime stubs in droidstubs"Jihoon Kang2024-03-203-85/+9
| |/ | | | | | | | | | | | | | | | | | | | | Revert submission 2929615 Reason for revert: b/328225000 Reverted changes: /q/submissionid:2929615 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:17f01d976acd757cb6afabba3f3606a6b25d0ecf) Merged-In: Ifbec11417103c96b37a4da18dfc9fda73f654d8f Change-Id: Ifbec11417103c96b37a4da18dfc9fda73f654d8f
| * Snap for 11526283 from 558c8dc2193040f29b3d031cb0b9711f2d605fd2 to 24Q2-releaseAndroid Build Coastguard Worker2024-03-055-8/+230
| |\ | | | | | | | | | Change-Id: I8bb7a133bd91fdbc5e01e6d191e597612dd3b535
| | * Support partial module variants with apex_contributions am: 972917d794 am: ↵Spandan Das2024-03-042-2/+71
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cbebb3437d Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2978138 Change-Id: I3b328671143a2e73202614d458a533fa6a4e056d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | * Support partial module variants with apex_contributions am: 972917d794Spandan Das2024-03-042-2/+71
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2978138 Change-Id: Ifc2ffd8b9cccf2151fd11e2111afb00912f91746 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | | * Support partial module variants with apex_contributionsSpandan Das2024-03-042-2/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some libraries like `libnativehelper_compat_libc++` only exist as shared library in module sdk. When prebuilt of this library is selected using apex_contritbutions, only shared linkages should be redirected to the prebuilt version. The static linkage should come from source. Test: Added a unit test Bug: 322175508 Change-Id: Ic65d376b2354b4a42c7b9ea3ed1cd80c37e2840f
| | * | | Fix non-determinism in prebuilt selection am: f2c1057586 am: d1816e09f0Spandan Das2024-03-043-3/+124
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2984036 Change-Id: I6062c3ccd1e864bd2d5cd7790957db99b6a76f63 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | * | Fix non-determinism in prebuilt selection am: f2c1057586Spandan Das2024-03-043-3/+124
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2984036 Change-Id: Id4f52ec49aad78751373840c6e1dc252990db0f1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | | * Fix non-determinism in prebuilt selectionSpandan Das2024-03-043-3/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This relands aosp/2978137 with acknowledgement of soong namespaces. If multiple versions of the prebuilt module sdk share the same soong config namespace, then PrebuiltPostDepsMutator rewrites rdeps to one of those prebuilts in a non-deterministic way. This CL uses apex_contributions to make this deterministic. Multiple prebuilts will not be allowed to have their prefer evaluate to true. If this happens, one of the prebuilts must be explicitly declared in apex_contributions. This CL also fixes the special-casing of the top-level java_sdk_library_import in ReplaceDirectDependencies. For framework-foo.v2, it will use BaseModuleName framework-foo instead of SdkLibraryName framework-foo.v2 to determine if the source module has been selected. Test: ran the previously failing cmd of b/327552112 Test: Added a unit test Test: aninja -t query out/soong/.intermediates/packages/modules/Permission/SafetyCenter/Config/safety-center-config/android_common/javac/safety-center-config.jar | grep module_sdk is empty (should not cause a regression for 323454855) Change-Id: Id484a41192085c50b7e34ad415c6e195edb0d006
| | * | | Merge changes I177441bc,I32daefbd into main am: 1c96fab7d0 am: 5d7d4ba90bSpandan Das2024-03-042-3/+35
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2984038 Change-Id: Ic323eae00fc8c07b42490af6d4caa5298d3e8b0d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | * | Merge changes I177441bc,I32daefbd into main am: 1c96fab7d0Spandan Das2024-03-042-3/+35
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2984038 Change-Id: I567f1873fefdb987776f544e755220cdbea5a97f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | | * Merge changes I177441bc,I32daefbd into mainSpandan Das2024-03-042-3/+35
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Use BaseModuleName for LOCAL_MODULE Disable source javalib dexpreopt when using prebuilt apex
| | | | | * Use BaseModuleName for LOCAL_MODULESpandan Das2024-03-041-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL uses OverrideName to ensure that the LOCAL_MODULE does not contain any version information. Test: Created CaptiveLoginPortalGoogle.v2, and checked that its LOCAL_MODULE is CaptiveLoginPortalGoogle Change-Id: I177441bcd55ca538759b69aafb73d0a8b7261179
| | | | | * Disable source javalib dexpreopt when using prebuilt apexSpandan Das2024-03-041-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The apex_contributions in next builds use prebuilt apexes with source java_sdk_library for javac. The dexpreopt rules of the source java_sdk_library are disabled via RELEASE_DEFAULT_MODULE_BUILD_FROM_SOURCE coupled with some complicated special-casing in android/prebuilt.go This special-casing breaks if we want to use prebuilts of some modules, and sources of other modules. To enable per mainline module toggelability, explicitly disable dexpreopt of source variant of java_sdk_library if we use prebuilt of the containing apex. Test: In internal, updated trunk_staging.scl's RELEASE_APEX_CONTRIBUTIONS_ADSERVICES to use prebuilt followed by m nothing Change-Id: I32daefbd38338b396d6f07b899826b2869d8f8e1
| | * | | | [automerger skipped] Copy imported APKs to output filename am: 2150160d8f -s ↵Colin Cross2024-03-040-0/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am skip reason: Merged-In I4a6dd1c5e48db7085ea41035def31f0844948a46 with SHA-1 5780d57a71 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/26377942 Change-Id: Ic6f08f557d4ddad32247b9cafa3c5bf980be40dc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | * | | | Copy imported APKs to output filenameColin Cross2024-02-291-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | android_app_import and android_test_import modules with processed: true and skip_preprocessed_apk_checks are used directly from the source tree. If the source file name doesn t match the module name and the file is used as test data it can result in the wrong filename being used. Copy the source file to an output file with the correct name first. Bug: 290376750 Test: m CtsAppSecurityHostTestCases (cherry picked from https://android-review.googlesource.com/q/commit:5780d57a7116643c6d9eac735982ac44bd6b0189) Merged-In: I4a6dd1c5e48db7085ea41035def31f0844948a46 Change-Id: I4a6dd1c5e48db7085ea41035def31f0844948a46
| | * | | | | [automerger skipped] Implement OutputFileProducer for android_app_import and ↵Colin Cross2024-03-040-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | android_test_import am: 955f87b65a -s ours am skip reason: Merged-In I5fc3a759462cfd4342b9330ac8978368feee26ca with SHA-1 5368d0b44a is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/26377941 Change-Id: Iecf90856a7154c1864ce4a9bed90ed73a610f174 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | * | | | Implement OutputFileProducer for android_app_import and android_test_importColin Cross2024-02-271-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: 290376750 Test: builds (cherry picked from https://android-review.googlesource.com/q/commit:5368d0b44a7124072ada43ae7f21fa6ded7e0606) Merged-In: I5fc3a759462cfd4342b9330ac8978368feee26ca Change-Id: I5fc3a759462cfd4342b9330ac8978368feee26ca
| * | | | | | Snap for 11520864 from ccb12a2e5430b4515ee75cf1791f044184368a2b to 24Q2-releaseAndroid Build Coastguard Worker2024-03-028-58/+42
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I035afb58aa6f37181e38528bde2c67571d0d277a
| | * | | | | Merge "Allow clippy::disallowed_names since it can be used for debugging" ↵Stephen Hines2024-03-011-0/+2
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into main am: 0684c5fc11 am: 7180b3caa6 Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2984234 Change-Id: I2360618cf27eac35e5b8ade0895124c272a73439 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | * | | | Merge "Allow clippy::disallowed_names since it can be used for debugging" ↵Stephen Hines2024-03-011-0/+2
| | | |\ \ \ \ | | | | | |/ / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into main am: 0684c5fc11 Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2984234 Change-Id: I60e3c13929bc8415fe9043826c39ff285374817b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | | * | | Merge "Allow clippy::disallowed_names since it can be used for debugging" ↵Stephen Hines2024-03-011-0/+2
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into main
| | | | | * | | Allow clippy::disallowed_names since it can be used for debuggingStephen Hines2024-02-291-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://rust-lang.github.io/rust-clippy/master/index.html#/disallowed_names The current list is extremely short ("foo", "baz", "quux"), and thus this really just prevents people from temporarily using `foo` to debug code. In the spirit of improving productivity and reducing frustration, it's easier to just allow this. Bug: N/A Test: TH Change-Id: I50b65486ed2b58bfd2cf699ee3b43b936d25f2cb
| | * | | | | | Merge "Add the build flags for apex contribution contents" into main am: ↵Treehugger Robot2024-03-011-0/+10
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e9f270a61f am: 308388d2fa Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2982634 Change-Id: I5569873027318d2714e485705884025584cc3d22 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | * | | | | Merge "Add the build flags for apex contribution contents" into main am: ↵Treehugger Robot2024-03-011-0/+10
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e9f270a61f Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2982634 Change-Id: I26305a22b59823db84b225850be812e4249110a8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | | * | | | Merge "Add the build flags for apex contribution contents" into mainTreehugger Robot2024-02-291-0/+10
| | | | |\ \ \ \
| | | | | * | | | Add the build flags for apex contribution contentsSpandan Das2024-02-291-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will be used for source vs prebuilt selection of Google apps Test: go build ./android Bug: 326995930 Change-Id: Idb535c468534ed691431315edcf7a279024dc7f1
| | * | | | | | | Merge changes I34385c48,I1e48947c into main am: 45ac47edab am: 4e2594e20aRyan Prichard2024-02-292-5/+10
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2983535 Change-Id: Ia90c0116660103fbda31cad4ef91ef116bb1deb9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | * | | | | | Merge changes I34385c48,I1e48947c into main am: 45ac47edabRyan Prichard2024-02-292-5/+10
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2983535 Change-Id: I223f80828e80829d151fa9dd599ac0ecfee9858b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | | * | | | | Merge changes I34385c48,I1e48947c into mainRyan Prichard2024-02-292-5/+10
| | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: disablePrebuilt: also clear sanitizer-dependent Srcs Define libc++ config macros to nothing
| | | | | * | | | | disablePrebuilt: also clear sanitizer-dependent SrcsRyan Prichard2024-02-281-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new libc++ prebuilt has HWASan and non-HWASan variants for arm64. Bug: 175635923 Test: checkout use-prebuilt-libcxx topic, build libc++demangle, verify that libc++demangle-install is not a valid build target Change-Id: I34385c48aa7ad1401e2547d65d30a14fa342e304
| | | | | * | | | | Define libc++ config macros to nothingRyan Prichard2024-02-281-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libc++[abi] always check whether one of these macros is defined, not the value the macro is defined to. With the new libc++, there is a Windows __config_site header that automatically defines _LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS and _LIBCPP_HAS_THREAD_API_WIN32 to nothing, so these definitions need to match to avoid a redefinition error. Bug: 175635923 Test: treehugger Test: m adb Change-Id: I1e48947c3b45e59804cdacd48776c7f3bd9a18c6
| | * | | | | | | | Merge "Remove --multitree-build" into main am: 7c8cf91ff8 am: 33f110f428Treehugger Robot2024-02-295-53/+20
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2982507 Change-Id: I735d657ce9e3f564fb1e6befd4c7043d4707d797 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | * | | | | | | Merge "Remove --multitree-build" into main am: 7c8cf91ff8Treehugger Robot2024-02-295-53/+20
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2982507 Change-Id: I86c17fc27621ce32ebf555ba4c2222b1ad4c0dec Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | | * | | | | | Merge "Remove --multitree-build" into mainTreehugger Robot2024-02-295-53/+20
| | | | |\ \ \ \ \ \
| | | | | * | | | | | Remove --multitree-buildCole Faust2024-02-285-53/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Multitree has been discontinued. Test: m nothing --no-skip-soong-tests Change-Id: Ie4d96a11279bf0f20a5e1a49837d9df4b24b1662
| * | | | | | | | | | Snap for 11517367 from 0c5304b48133e308eead7e1c6403cb68ec332c32 to 24Q2-releaseAndroid Build Coastguard Worker2024-03-0116-44/+254
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I340bc92558425d3e26708f12618e4191a5ed8824
| | * | | | | | | | | Merge "Use R.txt files from aar files directly" into main am: 4b6a3ae65c am: ↵Colin Cross2024-02-291-4/+4
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d2820e81aa Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2980833 Change-Id: Ica62f75a236a2e8a2cb3039ecdcae73851de1f07 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>