aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-05-24Merge "Fix a bug where CppFlags should have been Cppflags" into udc-dev am: ↵Yu Liu
2b9f3f983b Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23353145 Change-Id: I89d9cd577e98034d0a35eeaf00893f4653d6236a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24Merge "Revert "Revert "mixed builds correctly reference stubs libs""" into ↵Yu Liu
udc-dev
2023-05-24Merge "Fix a bug where CppFlags should have been Cppflags" into udc-devYu Liu
2023-05-24Snap for 10186302 from 16cf0388ca9e8e1740f7dd45399a055743e697b1 to ↵Android Build Coastguard Worker
udc-qpr1-release Change-Id: Ia2337f4e3c0b8c5a001e7888ca5c783de5cfbb64
2023-05-24Merge "Do not modify input in-place" into udc-dev am: 4f0c490ac9 am: b70571796fYu Liu
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23374037 Change-Id: I453029982b83e19ae6efd54a95af0a8152527a70 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24Merge "VSDK: etc snapshot may have sub_dir for relative_install_path" into ↵Treehugger Robot
udc-dev am: 66902d7ec0 am: 2fc42ce65b Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23275518 Change-Id: Ib7d006e4ca44eaefc274668c929f05dcfd9ce174 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24Merge "Do not modify input in-place" into udc-dev am: 4f0c490ac9Yu Liu
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23374037 Change-Id: I41e50370d14280c6a1d336170c3b522a85e6f4c7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24Merge "VSDK: etc snapshot may have sub_dir for relative_install_path" into ↵Treehugger Robot
udc-dev am: 66902d7ec0 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23275518 Change-Id: I47d677a725f7cb053d3328f84e490aaad442737f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23Merge "Do not modify input in-place" into udc-devYu Liu
2023-05-23Merge "VSDK: etc snapshot may have sub_dir for relative_install_path" into ↵Treehugger Robot
udc-dev
2023-05-23Increase R8 max heap size to 4GBJared Duke
The size was increased for D8 in an earlier change, but is more critical for R8. Match the D8 configuration. Bug: 241220562,283888124 Test: m (cherry picked from https://android-review.googlesource.com/q/commit:3e65f2a53c6e5fd82ddad403360bb87b986ad0d8) Merged-In: I3b98bf6098f2196c87a97f6c8f7308d9299170d8 Change-Id: I3b98bf6098f2196c87a97f6c8f7308d9299170d8
2023-05-23Merge "Differentiate between empty and nil input" into udc-dev am: ↵Yu Liu
267a137415 am: 726911e15f Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23374038 Change-Id: I9daafc317680d748dd69d3c60038b89454aea6d7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23Merge "Revert "Make min_sdk overridable in override_apex"" into udc-dev am: ↵Yu Liu
e80e5d8531 am: 9e36dcfd6b Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23374036 Change-Id: Ia7cbd620ce14ae11aa985fca4413917f05c810ba Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23Merge "Differentiate between empty and nil input" into udc-dev am: 267a137415Yu Liu
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23374038 Change-Id: Ifa3209d08ba059fe5d5b5d8105388593601a5cc3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23Merge "Revert "Make min_sdk overridable in override_apex"" into udc-dev am: ↵Yu Liu
e80e5d8531 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23374036 Change-Id: I4936df7603af8a6caa0d7e89d4c90cfa5e19c006 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23Fix a bug where CppFlags should have been CppflagsYu Liu
Bug: 284009449 Test: unit test and manual build (cherry picked from https://android-review.googlesource.com/q/commit:93893ba061e774c30a647d42e011838822153511) Merged-In: I9abb056e6b820414707247d1b19ba6aabffc26ea Change-Id: I9abb056e6b820414707247d1b19ba6aabffc26ea
2023-05-23Merge "Differentiate between empty and nil input" into udc-devYu Liu
2023-05-23Merge "Revert "Make min_sdk overridable in override_apex"" into udc-devYu Liu
2023-05-23Update clang version for Rust bindgen to clang-r487747c am: 3de0cb7b4d am: ↵Yi Kong
3dc490245a Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23385290 Change-Id: Ie21dc9f7e061947af5744959ef4767b1bc5eab98 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23Update clang version for Rust bindgen to clang-r487747c am: 3de0cb7b4dYi Kong
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23385290 Change-Id: I80dc51ef6c5e60efbf73b9a2ff33a427f3eb26b6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23Update clang version for Rust bindgen to clang-r487747cYi Kong
Test: presubmit Bug: 279955553 (cherry picked from https://android-review.googlesource.com/q/commit:6974c7ec725a948a56cd8e83bff4a2cc9cf909e3) Merged-In: I9092263024b5b8dc7a1538b00f318ef0d5c29bb7 Change-Id: I9092263024b5b8dc7a1538b00f318ef0d5c29bb7
2023-05-22Revert "Revert "mixed builds correctly reference stubs libs""Sam Delmerico
This reverts commit 1db4348734acfd0b4a38e2ff49dca2df4bac0d84. Changes from original: - extracted function to add the current version to stub versions for bp2build. - added libc++ to mixed builds denylist Reason for revert: re-uploading with fix in topic Bug: 270408757 (cherry picked from https://android-review.googlesource.com/q/commit:75dbca2eae78bb280b50828d3c2165bda5d87ba5) Merged-In: Ifa0ed456bf8cb4a7f861d6826263adfedb4fdd9c Change-Id: Ifa0ed456bf8cb4a7f861d6826263adfedb4fdd9c
2023-05-22Do not modify input in-placeSpandan Das
SortedUniqueStrings and FirstUniqueStrings dedupes repeating elements and returns the deduped list. Currently, it also modifies the input list in-place, which causes non-determinisitc failures like b/275313114 Operate on a copy of the input so that the input remains untouched. SortedUniqueStrings is O(NlogN) and FirstUniqueStrings is ~O(N), so creating a copy (O(N)) should not result in major performance regressions. Numbers for this single unit test: ``` go test . -run TestStubsForLibraryInMultipleApexes -v -count 1000 Before: 174s After: 172s ``` Bug: 275313114 Test: go test ./android Test: go test . -run TestStubsForLibraryInMultipleApexes -v -count 1000 (cherry picked from https://android-review.googlesource.com/q/commit:8a8714c781175f8f1a6c189d919ee8b0ee8c1e27) Merged-In: Id859723b2c2ebdc0023876c4b6fabe75d870bad7 Change-Id: Id859723b2c2ebdc0023876c4b6fabe75d870bad7
2023-05-22Differentiate between empty and nil inputSpandan Das
Previously, CopyOf on an empty list was returning nil. With the updates to SortedUniqueStrings and FirstUniqueStrings, we need to differentiate between empty lists and nil. Bug: 275313114 Test: m nothing (cherry picked from https://android-review.googlesource.com/q/commit:cc4da765113299fa11dcb1e651ec4ae33e6f8f9b) Merged-In: I91063ebbe5013cbda5d8f70efde4683c66581599 Change-Id: I91063ebbe5013cbda5d8f70efde4683c66581599
2023-05-22Revert "Make min_sdk overridable in override_apex"Liz Kammer
This reverts commit 133c55b48abe73a51efc6f7cd30b6b6e318ba6f9. Reason for revert: change was untested and not working Bug: 266945903 (cherry picked from https://android-review.googlesource.com/q/commit:bd58e746928bdfd618ba81e66a19dc42f7b15380) Merged-In: I06d6e3c439ba541ae85dc148f91b184b9731b92d Change-Id: I06d6e3c439ba541ae85dc148f91b184b9731b92d
2023-05-20Snap for 10174855 from 167404ce5465770ef06184e8fa4e4472c28a096b to ↵Android Build Coastguard Worker
udc-qpr1-release Change-Id: Iccfebf3cabe6e74aa2f7ae5d8a14e08bfdcb2cec
2023-05-20Snap for 10171934 from f9e579406a4751a947885f599ca6d634159e791c to ↵Android Build Coastguard Worker
udc-qpr1-release Change-Id: I5404d9b5d29acbc780562f119a407b9f5f467c17
2023-05-19Merge changes from topic ↵Wei Li
"cherrypicker-L80700000960770298:N69600001370607907" into udc-dev am: dabeb50e32 am: 84c2169ba9 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23337458 Change-Id: Ic3fae4ac57ac9a0635a500150b50555e5fe19c21 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19Export some make variables to Bazel through product variables. am: ↵Wei Li
5cfedc8062 am: dab4e74239 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23337457 Change-Id: I0fbd15bf61852b712f65db0481f34f46c9fbdcf0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19Merge changes from topic ↵Wei Li
"cherrypicker-L80700000960770298:N69600001370607907" into udc-dev am: dabeb50e32 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23337458 Change-Id: Ie027e875ec6b1829ac84e929848f4ae3a7acb833 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19Export some make variables to Bazel through product variables. am: 5cfedc8062Wei Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23337457 Change-Id: I0654c22910f4c7985edc2d5ece16b5a826415d3e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19Merge changes from topic ↵Wei Li
"cherrypicker-L80700000960770298:N69600001370607907" into udc-dev * changes: Change bp2build converter of module "package". Export some make variables to Bazel through product variables.
2023-05-19Merge "Don't panic if no certificates found" into udc-dev am: 16ef197d6a am: ↵Treehugger Robot
f1fdf0ef62 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23297153 Change-Id: Ib694a40cf217d72726635356b02e0a9c68eb78cc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19Merge "Don't panic if no certificates found" into udc-dev am: 16ef197d6aTreehugger Robot
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23297153 Change-Id: Ib1e281927bee383134b39b0298d46c7e71a98837 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19Merge "Don't panic if no certificates found" into udc-devTreehugger Robot
2023-05-19Allowlist SBOM generation tool so it can be used in Bazel. am: 9d307945be ↵Wei Li
am: 0a3d198f5c Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23305007 Change-Id: Id8b07d7332c2b0498ea31111c4a1f7f4e46075c9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19Allowlist SBOM generation tool so it can be used in Bazel. am: 9d307945beWei Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23305007 Change-Id: Icad32f05f0c6cf783f7a38a6aebbf85e75084de4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19Change bp2build converter of module "package".Wei Li
1) Use attribute name "default_package_metadata" instead of "default_applicable_licenses" in packages to better describe its use. 2) Add a filegroup "default_metadata_file" in packages to search for METADATA file in each package. 3) Include "default_metadata_file" in each package's "default_package_metadata" attribute. Bug: 275472038 Test: CIs (cherry picked from https://android-review.googlesource.com/q/commit:2c9e8d612819840020b2d110d23fb2771b6c92f0) Merged-In: I645c013c39e3190fd96c4a549d39a331aced16bd Change-Id: I645c013c39e3190fd96c4a549d39a331aced16bd
2023-05-19Export some make variables to Bazel through product variables.Wei Li
Bug: 275472038 Test: CIs (cherry picked from https://android-review.googlesource.com/q/commit:c642d688d6a091766536f0e02696d43e393f93e0) Merged-In: I4fdd0f989d75045644e8f2e32d1eb77543a3b9f3 Change-Id: I4fdd0f989d75045644e8f2e32d1eb77543a3b9f3
2023-05-18Revert "Turn off stack protector check for noreturn calls" am: 79b9b94ea3 ↵Yi Kong
am: 418fa68614 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23320905 Change-Id: Iee1147f069498e748f50b5962d57d58fb831c47d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18Allowlist SBOM generation tool so it can be used in Bazel.Wei Li
Bug: 275472038 Test: b build //build/make/tools/sbom:generate-sbom && bazel-out/aosp_cf_x86_64_phone-userdebug_linux_x86_64-opt/bin/build/make/tools/sbom/generate-sbom (cherry picked from https://android-review.googlesource.com/q/commit:74e3e003148d202749cc79456e61f65ba1f4f25a) Merged-In: I4ad68b0613410f40c79ee24d3eef779c2ad57815 Change-Id: I4ad68b0613410f40c79ee24d3eef779c2ad57815
2023-05-18Revert "Turn off stack protector check for noreturn calls" am: 79b9b94ea3Yi Kong
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23320905 Change-Id: I587c82af01db8fb61433bf703602cb144d722ea0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18Revert "Turn off stack protector check for noreturn calls"Yi Kong
clang-r487747c contains upstream fix for the excessive stack protactor checks (fc4494dffa54) and checks are no longer inserted for C only code or C++ code built without exeception. The Android platform does not enable C++ exception by default, thus turning on the check should not have significant performance impact. This reverts commit ecc18df6ff68853517749c49f411070a0b8d219f. Test: presubmit Bug: 277565884 Bug: 279955553 (cherry picked from https://android-review.googlesource.com/q/commit:e9850f81531f070ac5cd193fdcd767bc91605bfe) Merged-In: I2fc5826048ba5d00cabcc8401ac40a6f54812a44 Change-Id: I2fc5826048ba5d00cabcc8401ac40a6f54812a44
2023-05-18Don't panic if no certificates foundZyan Wu
Getting the first certificate will panic if there are no certificates, which can happen when AllowMissingDependencies is set and the certificate property is a module reference to a missing module. Only get the first certificate if the list is not nil. Use mainCertificate since it handles the logic already. Test: TestAppMissingCertificateAllowMissingDependencies Bug: 283102635 Merged-In: : I8b27f65aa7d071041171ad45ac52bf47fa31bf2b Change-Id: Icaaa45d48ca4edb876687c0813165d107d28ef8a
2023-05-18Snap for 10157673 from 6ad247876479e5e45493439087f1010db1fbf2c4 to ↵Android Build Coastguard Worker
udc-qpr1-release Change-Id: I9e18b1ba38197f095318de8ef537de23f1d80d47
2023-05-17Merge "Touch soong_build output at the end of main" into udc-dev am: ↵Treehugger Robot
4020b810e9 am: 85e5464d2a Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23287178 Change-Id: I8c66942c219b29d25c721992619f648282a0ed21 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17Merge "Touch soong_build output at the end of main" into udc-dev am: 4020b810e9Treehugger Robot
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23287178 Change-Id: Ic27300097b9ba023d2aa5f1a7ba4114550fa0dcb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17Merge "Touch soong_build output at the end of main" into udc-devTreehugger Robot
2023-05-17Touch soong_build output at the end of mainChris Parsons
This fixes an incrementality bug that resulted in superfluous build.ninja regeneration after a new glob definition is added. (cherry picked from https://android-review.git.corp.google.com/c/platform/build/soong/+/2585669) Fixes: 279674820 Test: Treehugger Test; New integration test in this CL Merged-In: Ifefe66a0eb1c125e9ad5373d60437a1cb1e6fdec Change-Id: Ifefe66a0eb1c125e9ad5373d60437a1cb1e6fdec
2023-05-17VSDK: etc snapshot may have sub_dir for relative_install_pathJustin Yun
prebuilt_etc may use sub_dir property to define a relative install path. Use SubDir() to read either sub_dir or relative_install_path property. Bug: 282080219 Test: m vendor-image Merged-In: I07a21c5aeb87b403854ed32976d26e70b046b8c1 Change-Id: I07a21c5aeb87b403854ed32976d26e70b046b8c1 (cherry picked from commit 8bd3afe68c2670db7a39c7730a605d4b17c94122)
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-22 08:23:14 +0000