Commit Graph

68533 Commits

Author SHA1 Message Date
Alexei Nicoara
177496ca6b [automerger skipped] DO NOT MERGE Increasing the dev branch default module version am: 373e894e3c -s ours am: d5ce519031 -s ours
am skip reason: Merged-In Iad9079f026f46da35f36723937db9bf5771580d1 with SHA-1 1240f28d09 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23830108

Change-Id: I465f40b958763dda92835f0aaba12f929c34693d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 12:14:03 +00:00
Alexei Nicoara
d5ce519031 [automerger skipped] DO NOT MERGE Increasing the dev branch default module version am: 373e894e3c -s ours
am skip reason: Merged-In Iad9079f026f46da35f36723937db9bf5771580d1 with SHA-1 1240f28d09 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23830108

Change-Id: I2fbe4051e5e8309e530ca92531c663fa56bac6ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-28 10:44:21 +00:00
Alexei Nicoara
373e894e3c DO NOT MERGE Increasing the dev branch default module version
After the prebuilt drop the modules under test in udc-dev can not be installed anymore because their version is lower than the prebuilt version. Increasing the version so the modules built from source would have a higher version.

Bug: 288871663
Change-Id: If5cfd3ec62860a6f26bdd87ee6c77248c2bea0fb
Ignore-AOSP-First: change needed on udc-dev only
Merged-In: Iad9079f026f46da35f36723937db9bf5771580d1
2023-06-27 16:29:31 +00:00
Gurpreet Singh
f1964b5b67 [automerger skipped] DO NOT MERGE Add genrule to build *.latest.version build target. am: 8a7dad00c2 -s ours am: 207a631f9c -s ours am: 61636530ce -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23638331

Change-Id: Id1a82246c4a60e0c858ce0200b69f3629e478ad6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 21:34:47 +00:00
Gurpreet Singh
61636530ce [automerger skipped] DO NOT MERGE Add genrule to build *.latest.version build target. am: 8a7dad00c2 -s ours am: 207a631f9c -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23638331

Change-Id: I838aed06dc6245a3b66fe842626ad74032ad0bbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 20:50:11 +00:00
Gurpreet Singh
207a631f9c [automerger skipped] DO NOT MERGE Add genrule to build *.latest.version build target. am: 8a7dad00c2 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23638331

Change-Id: I5d87e013957af1cb79476a1e4cf291e3281485bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 20:02:38 +00:00
Gurpreet Singh
8a7dad00c2 DO NOT MERGE Add genrule to build *.latest.version build target.
Build a new target *.latest.version which will contain a text file
containing the last finalized version.

Bug: 242316893
Test: atest prebuilt_apis_test
(cherry picked from https://android-review.googlesource.com/q/commit:daa314ac97d5ab8076113ee7f269b4e4cc3cf620)

Merged-In: I41fa91c9ec273f342b7807c66c4d65ba13260124
Change-Id: I41fa91c9ec273f342b7807c66c4d65ba13260124
2023-06-14 16:35:37 +00:00
Yi Kong
ccb228c33c afdo: Remove -fprofile-sample-accurate flag am: 9825a6c7f8 am: ac03dfab7f
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23587699

Change-Id: I037f3b3ce208ee9f885bb012d14c244d08077e14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 02:31:37 +00:00
Yi Kong
ac03dfab7f afdo: Remove -fprofile-sample-accurate flag am: 9825a6c7f8
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23587699

Change-Id: Id63a967929a850a8b5c8fa7725b3fc7fbdeffb41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 01:48:07 +00:00
Yi Kong
9825a6c7f8 afdo: Remove -fprofile-sample-accurate flag
-fprofile-sample-accurate allows the compiler to de-optimize cold code
paths according to the profile. However we have a number of micro-
benchmarks that tests these paths and we often trigger regression
reports from those benchmarks.

Turning off the flag mitigates the issue at a cost of ~2MB increase in
system image size. But the more deterministic codegen could reduce the
differential OTA size.

Test: presubmit
Bug: 283235002
(cherry picked from https://android-review.googlesource.com/q/commit:febf8b9bdf40b086a50930901a7ccfaaa628bcba)
Merged-In: I1016f573f21a60223a97c64f5818f0e7e66e41e3
Change-Id: I1016f573f21a60223a97c64f5818f0e7e66e41e3
2023-06-06 17:19:50 +00:00
Yu Liu
bebdce680d Merge "Revert "Revert "mixed builds correctly reference stubs libs""" into udc-dev am: 98f13dd1a0 am: cd941e2b60
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23374491

Change-Id: I68a6f2c68495176b4c88f086b866f664d69db44a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 18:41:33 +00:00
Yu Liu
14940daa3e Merge "Fix a bug where CppFlags should have been Cppflags" into udc-dev am: 2b9f3f983b am: a62b5cdc1a
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23353145

Change-Id: I59f599e8716b22ed34ee91a395589da29d23d25b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 18:41:07 +00:00
Yu Liu
cd941e2b60 Merge "Revert "Revert "mixed builds correctly reference stubs libs""" into udc-dev am: 98f13dd1a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23374491

Change-Id: I3dfa962e2be4f44aa0863867d026fbaeec58b790
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 17:57:56 +00:00
Yu Liu
a62b5cdc1a Merge "Fix a bug where CppFlags should have been Cppflags" into udc-dev am: 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-24 17:57:05 +00:00
Yu Liu
98f13dd1a0 Merge "Revert "Revert "mixed builds correctly reference stubs libs""" into udc-dev 2023-05-24 17:15:05 +00:00
Yu Liu
2b9f3f983b Merge "Fix a bug where CppFlags should have been Cppflags" into udc-dev 2023-05-24 17:14:33 +00:00
Yu Liu
b4a1f9cc96 Merge "Do not modify input in-place" into udc-dev am: 4f0c490ac9 am: b70571796f
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-24 00:58:39 +00:00
Treehugger Robot
556d5e364a Merge "VSDK: etc snapshot may have sub_dir for relative_install_path" into 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-24 00:58:24 +00:00
Yu Liu
b70571796f Merge "Do not modify input in-place" into udc-dev am: 4f0c490ac9
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-24 00:16:28 +00:00
Treehugger Robot
2fc42ce65b Merge "VSDK: etc snapshot may have sub_dir for relative_install_path" into 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-24 00:16:01 +00:00
Yu Liu
4f0c490ac9 Merge "Do not modify input in-place" into udc-dev 2023-05-23 23:27:34 +00:00
Treehugger Robot
66902d7ec0 Merge "VSDK: etc snapshot may have sub_dir for relative_install_path" into udc-dev 2023-05-23 23:19:22 +00:00
Jared Duke
79435deb8d Increase R8 max heap size to 4GB
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-23 21:31:00 +00:00
Yu Liu
1142d4901a Merge "Differentiate between empty and nil input" into udc-dev am: 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-23 21:01:47 +00:00
Yu Liu
3b62059594 Merge "Revert "Make min_sdk overridable in override_apex"" into udc-dev am: 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-23 21:01:18 +00:00
Yu Liu
726911e15f Merge "Differentiate between empty and nil input" into udc-dev am: 267a137415
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-23 20:20:12 +00:00
Yu Liu
9e36dcfd6b Merge "Revert "Make min_sdk overridable in override_apex"" into udc-dev am: 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-23 20:19:14 +00:00
Yu Liu
67c131f75f Fix a bug where CppFlags should have been Cppflags
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-23 19:49:43 +00:00
Yu Liu
267a137415 Merge "Differentiate between empty and nil input" into udc-dev 2023-05-23 19:42:30 +00:00
Yu Liu
e80e5d8531 Merge "Revert "Make min_sdk overridable in override_apex"" into udc-dev 2023-05-23 19:32:23 +00:00
Yi Kong
16cf0388ca Update clang version for Rust bindgen to clang-r487747c am: 3de0cb7b4d am: 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-23 10:50:37 +00:00
Yi Kong
3dc490245a Update clang version for Rust bindgen to clang-r487747c am: 3de0cb7b4d
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-23 10:09:30 +00:00
Yi Kong
3de0cb7b4d Update clang version for Rust bindgen to clang-r487747c
Test: presubmit
Bug: 279955553
(cherry picked from https://android-review.googlesource.com/q/commit:6974c7ec725a948a56cd8e83bff4a2cc9cf909e3)
Merged-In: I9092263024b5b8dc7a1538b00f318ef0d5c29bb7
Change-Id: I9092263024b5b8dc7a1538b00f318ef0d5c29bb7
2023-05-23 07:27:03 +00:00
Sam Delmerico
db5d662663 Revert "Revert "mixed builds correctly reference stubs libs""
This reverts commit 1db4348734.

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-22 22:43:51 +00:00
Spandan Das
ee84727d95 Do not modify input in-place
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-22 22:42:19 +00:00
Spandan Das
de41a698f1 Differentiate between empty and nil input
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-22 22:41:59 +00:00
Liz Kammer
9a65ff8d1f Revert "Make min_sdk overridable in override_apex"
This reverts commit 133c55b48a.

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-22 22:39:46 +00:00
Wei Li
167404ce54 Merge changes from topic "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-19 23:10:33 +00:00
Wei Li
4eca2776ca Export some make variables to Bazel through product variables. am: 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-19 23:10:28 +00:00
Wei Li
84c2169ba9 Merge changes from topic "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-19 22:25:05 +00:00
Wei Li
dab4e74239 Export some make variables to Bazel through product variables. am: 5cfedc8062
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-19 22:25:01 +00:00
Wei Li
dabeb50e32 Merge changes from topic "cherrypicker-L80700000960770298:N69600001370607907" into udc-dev
* changes:
  Change bp2build converter of module "package".
  Export some make variables to Bazel through product variables.
2023-05-19 21:37:23 +00:00
Treehugger Robot
f9e579406a Merge "Don't panic if no certificates found" into udc-dev am: 16ef197d6a am: 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-19 17:42:00 +00:00
Treehugger Robot
f1fdf0ef62 Merge "Don't panic if no certificates found" into udc-dev am: 16ef197d6a
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-19 17:01:49 +00:00
Treehugger Robot
16ef197d6a Merge "Don't panic if no certificates found" into udc-dev 2023-05-19 16:18:34 +00:00
Wei Li
ce5a279390 Allowlist SBOM generation tool so it can be used in Bazel. am: 9d307945be 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-19 01:44:36 +00:00
Wei Li
0a3d198f5c Allowlist SBOM generation tool so it can be used in Bazel. am: 9d307945be
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-19 01:02:13 +00:00
Wei Li
dff65b0114 Change bp2build converter of module "package".
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-19 00:35:57 +00:00
Wei Li
5cfedc8062 Export some make variables to Bazel through product variables.
Bug: 275472038
Test: CIs
(cherry picked from https://android-review.googlesource.com/q/commit:c642d688d6a091766536f0e02696d43e393f93e0)
Merged-In: I4fdd0f989d75045644e8f2e32d1eb77543a3b9f3
Change-Id: I4fdd0f989d75045644e8f2e32d1eb77543a3b9f3
2023-05-19 00:35:50 +00:00
Yi Kong
3467708fc6 Revert "Turn off stack protector check for noreturn calls" am: 79b9b94ea3 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-18 22:01:56 +00:00