Commit Graph

71343 Commits

Author SHA1 Message Date
Treehugger Robot
c829d9a813 Merge "Remove unnecessary options when generating stubs from signatures" into main am: c09e38de00 am: d148e1f232
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2709427

Change-Id: Idac84dc3cab108cd29e18bf23d11fc625f73cc41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31 11:30:53 +00:00
Treehugger Robot
d148e1f232 Merge "Remove unnecessary options when generating stubs from signatures" into main am: c09e38de00
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2709427

Change-Id: Ib5c271a64158a889d910220fb8cbacbe33c0e0b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31 10:38:44 +00:00
Treehugger Robot
c09e38de00 Merge "Remove unnecessary options when generating stubs from signatures" into main 2023-08-31 09:45:30 +00:00
Paul Duffin
336b16a325 Remove unnecessary options when generating stubs from signatures
These options are unnecessary because:
* `--format` and `--api-overloaded-method-order` only affects the
  generation of signature files which this does not do.

Also changed the build rule description to differentiate from the
usual metalava command to make it easier to find in the ninja file.

Bug: 296115567
Test: m --build-from-text-stub
Change-Id: I7986cba00c364282ddc436d2e69bfb66eda46436
2023-08-31 08:07:26 +01:00
Yu Liu
a0c98dd28e Merge "Allowlist platform-test-annotations (new dependency of bouncycastle)" into main am: 37aa33fcb1 am: 2736b2dd44
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2734233

Change-Id: I9f31ccc9913ffe77ec437efaac7180ca8d628900
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-30 21:05:00 +00:00
Treehugger Robot
5b454eab40 Merge "Fix false pos in bp2build-prog due to prebulits" into main am: 8d7f2e41d1 am: a45d3f4ee6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2728374

Change-Id: I48415818a2d3796bc38488d2a2b6396fdcef5083
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-30 21:02:32 +00:00
Yu Liu
2736b2dd44 Merge "Allowlist platform-test-annotations (new dependency of bouncycastle)" into main am: 37aa33fcb1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2734233

Change-Id: Ied817a5a32722b6e514a85ec01e524a20078aaff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-30 20:15:10 +00:00
Treehugger Robot
a45d3f4ee6 Merge "Fix false pos in bp2build-prog due to prebulits" into main am: 8d7f2e41d1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2728374

Change-Id: I30d7471aa5720bac63a832590ed97802137170dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-30 20:10:07 +00:00
Yu Liu
37aa33fcb1 Merge "Allowlist platform-test-annotations (new dependency of bouncycastle)" into main 2023-08-30 19:20:44 +00:00
Treehugger Robot
8d7f2e41d1 Merge "Fix false pos in bp2build-prog due to prebulits" into main 2023-08-30 18:27:32 +00:00
Yu Liu
8344a71594 Merge "Support memtag sanitizer." into main am: 698c8f63e0 am: 9bbe019179
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2726803

Change-Id: Ie4f5b6dc54b83af2e5e711361e9804118f10495c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-30 17:40:12 +00:00
Liz Kammer
0b6b815556 Merge "Add do not convert for sdk_version unset" into main am: f236cd9247 am: 47059ae7ab
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2698553

Change-Id: I5f1228b6c35f4ad6ff1d902b6315de719cd76f52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-30 17:39:34 +00:00
Jared Duke
444b4686b5 Merge "Reland "Enable R8 full mode by default for apps"" into main am: 2860cf1bc8 am: 9facd0d400
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2731593

Change-Id: I4d82687a688d8945030735b77f519e00a28f0bc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-30 17:38:32 +00:00
Yu Liu
9bbe019179 Merge "Support memtag sanitizer." into main am: 698c8f63e0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2726803

Change-Id: Iae509f4b20b70b0736a10302dc98da6e28c2cc1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-30 17:36:11 +00:00
Liz Kammer
47059ae7ab Merge "Add do not convert for sdk_version unset" into main am: f236cd9247
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2698553

Change-Id: Id475ee06602fad0be99217035cc97231329ad3db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-30 17:34:51 +00:00
Yu Liu
698c8f63e0 Merge "Support memtag sanitizer." into main 2023-08-30 17:22:59 +00:00
Liz Kammer
f236cd9247 Merge "Add do not convert for sdk_version unset" into main 2023-08-30 16:59:50 +00:00
Jared Duke
9facd0d400 Merge "Reland "Enable R8 full mode by default for apps"" into main am: 2860cf1bc8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2731593

Change-Id: Icf8c60397c7ae58f7a9d6d2ab06119a322914479
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-30 16:48:07 +00:00
Romain Jobredeaux
520ab19c23 Allowlist platform-test-annotations (new dependency of bouncycastle)
Change-Id: I68ee46622d0b9048d8e53a8a74721aac139e9ddd
2023-08-30 12:19:54 -04:00
Jared Duke
2860cf1bc8 Merge "Reland "Enable R8 full mode by default for apps"" into main 2023-08-30 16:03:18 +00:00
Treehugger Robot
3f820384ea Merge "Prevent concurrent read/writes to a map" into main am: 662b09e8c3 am: eeb5008f8e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2731378

Change-Id: If4c053de3391d6efffe72b07b1a52b5ff71b8454
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-30 04:04:06 +00:00
Treehugger Robot
eeb5008f8e Merge "Prevent concurrent read/writes to a map" into main am: 662b09e8c3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2731378

Change-Id: Ia4087b03dc2a86c67f097e8bc2ee2b06b7080bcf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-30 03:12:54 +00:00
Treehugger Robot
662b09e8c3 Merge "Prevent concurrent read/writes to a map" into main 2023-08-30 02:40:07 +00:00
Liz Kammer
02914408de Add do not convert for sdk_version unset
When sdk_version is unset, the build with fail with Bazel because
private APIs are do not build with Bazel at this time.

This instead prevents migrating the relevant target to Bazel in bp2build

Test: go tests
Change-Id: I31dabcf143de7933706d1b734ef21467a01b65e9
2023-08-29 20:06:48 -04:00
Spandan Das
fc6e645645 Prevent concurrent read/writes to a map
This should hopefully fix an intermittent flake in bp2build, which is
now run by default.

Test: go build ./android
Change-Id: Ic257a34448ab323df1680cf1990b087ed415a592
2023-08-29 23:59:20 +00:00
Treehugger Robot
ed953380d3 Merge "Allowlist more deps of adb" into main am: 8bbe26cad7 am: 56e9f9441c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2703474

Change-Id: I19197555ada2bbe50ed2458d072925605b6b041c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 20:54:40 +00:00
Treehugger Robot
56e9f9441c Merge "Allowlist more deps of adb" into main am: 8bbe26cad7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2703474

Change-Id: I3dcfc3e4029bcea41ff01bf38c3eca070235ec46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 20:03:07 +00:00
Treehugger Robot
8bbe26cad7 Merge "Allowlist more deps of adb" into main 2023-08-29 19:39:56 +00:00
Jared Duke
aa88b3d020 Reland "Enable R8 full mode by default for apps"
This is attempt 4 at landing this change. Prior attempts were
reverted due to downstream test breakages not in presubmit.
Those issues have been resolved, and additional manual heavy
presubmit tests were run to ensure stability.

Observed APK savings: ~24MB

This reverts commit 74a5c2ec76.

Reason for revert: Fixed ManagedProvisioningTests

Bug: 215530220
Change-Id: I223228a345fa1a3bad52fb3e91c744107e04fc07
2023-08-29 17:07:20 +00:00
Treehugger Robot
7c21354de3 Merge "Reland: Re-enable checks that pass in udc-dev-plus-aosp and downstream" into udc-dev-plus-aosp 2023-08-29 06:38:38 +00:00
Colin Cross
7b9c1e9065 Reland: Re-enable checks that pass in udc-dev-plus-aosp and downstream
This relands Ifa581e8d346cf7e70387d6aa3135203d6a7d621b after
fixes to the manifests of modules that didn't pass the new
lint checks.

Bug: 294098365
Test: treehugger
Test: https://android-build.googleplex.com/builds/abtd/run/L56200000962810233
Test: https://android-build.googleplex.com/builds/abtd/run/L49700000962810033
Change-Id: I82129ef29025f35c0f4fc20f2d892c0af39d76ae
2023-08-29 04:20:07 +00:00
Treehugger Robot
f6bbd111b9 Merge "Use board api level for seapp coredomain check" into main am: 37a0e4a0bd am: 2bc8b7cf1b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2727563

Change-Id: Ibfe3bc21d05739fa8cfcce4590148a106ea12f80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 02:45:45 +00:00
Treehugger Robot
2bc8b7cf1b Merge "Use board api level for seapp coredomain check" into main am: 37a0e4a0bd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2727563

Change-Id: I6f5af8e03106216cec73f6cac83eed213f9a71f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 01:56:09 +00:00
Treehugger Robot
37a0e4a0bd Merge "Use board api level for seapp coredomain check" into main 2023-08-29 01:09:37 +00:00
Yu Liu
7ece4aae36 Support memtag sanitizer.
Bug: 295173102
Test: local unit tests
Change-Id: Ib8cd82cd3989d9c120255e149473d8ec00f100f5
2023-08-28 17:14:58 -07:00
Xin Li
b56236d371 [automerger skipped] Merge "Merge Android U (ab/10368041)" into aosp-main-future am: a4479de778 -s ours
am skip reason: Merged-In I0a83d1213dde818cfa6a04e51ddeb2056fb7f87a with SHA-1 536349e466 is already in history

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

Change-Id: I5ccebb96f13cccba1e6e4ae67f7897e3160b3fbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 00:03:32 +00:00
Xin Li
7a5ff1b5ee [automerger skipped] Merge Android U (ab/10368041) am: 16b7e67db6 -s ours
am skip reason: Merged-In I0a83d1213dde818cfa6a04e51ddeb2056fb7f87a with SHA-1 536349e466 is already in history

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

Change-Id: I7686933cfa9f5c3177f2264a6f8acb642df644b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28 23:58:48 +00:00
Spandan Das
2c092a8f2f Merge "Bugfixes for proto_library (proto.include_dirs)" into main am: 26e2967e54 am: b6d55182c8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2727054

Change-Id: I1f07ea7d5e8a809cbc91d97b990d94c8b9c31c7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28 23:11:24 +00:00
Xin Li
a4479de778 Merge "Merge Android U (ab/10368041)" into aosp-main-future 2023-08-28 22:12:56 +00:00
Spandan Das
b6d55182c8 Merge "Bugfixes for proto_library (proto.include_dirs)" into main am: 26e2967e54
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2727054

Change-Id: I45f5b2f47ef65cc8320866dfdf291d1722352a15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28 22:11:41 +00:00
Spandan Das
26e2967e54 Merge "Bugfixes for proto_library (proto.include_dirs)" into main 2023-08-28 21:41:00 +00:00
Todd Lee
9f436acbc3 Merge "Support for incremetal platform prebuilt APIs" into main am: 5b6d1d87d6 am: f09f5d7995
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2726799

Change-Id: I3c157e588e2c3b54e0fc04aaf474aa1e93b3d4c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28 19:20:06 +00:00
Ivan Lozano
8d06636b32 Merge "rust: Rust sanitized snapshots variations" into main am: 791f60365e am: df0e3b1b71
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2723878

Change-Id: I69429fc5a97eb52f6fc3cae7bd9acc198d35b9b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28 19:19:38 +00:00
Todd Lee
f09f5d7995 Merge "Support for incremetal platform prebuilt APIs" into main am: 5b6d1d87d6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2726799

Change-Id: I8f17b42119655787ba6f17868a3006b3e96d37ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28 19:16:31 +00:00
Todd Lee
5b6d1d87d6 Merge "Support for incremetal platform prebuilt APIs" into main 2023-08-28 18:42:58 +00:00
Spandan Das
f26ee15e01 Bugfixes for proto_library (proto.include_dirs)
The fixes are
- Dedupe the dir list. Since we partition the proto srcs per pacakge and
  then iterate the map, a single include directory was being listed
  multiple times
- Drop target_compatible_with from these proto_library targets. The
  compatibility will be enforced at the top-level <lang>_proto_library.

Test: Added a unit test

Change-Id: Ia18c0f8c495585010fd4e372092afe80c5d8290c
2023-08-28 18:39:59 +00:00
Ivan Lozano
df0e3b1b71 Merge "rust: Rust sanitized snapshots variations" into main am: 791f60365e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2723878

Change-Id: I4205d02a6a4427091455d8ea3241d310ee2ef253
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28 18:35:54 +00:00
Ivan Lozano
791f60365e Merge "rust: Rust sanitized snapshots variations" into main 2023-08-28 18:01:22 +00:00
Treehugger Robot
eac4352579 Merge changes from topic "java-proto-include-dir" into main am: 7eb6ffc796 am: 3f352577f8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2723480

Change-Id: Iaf40c86fbe469330ba10c50de5ba0cf44f649f41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28 17:57:00 +00:00
Spandan Das
a1b2313d5c Translate python_libray.pkg_path to proto.import_prefix am: cb847638af am: 9c892b8daa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2721823

Change-Id: I11eb36a041f970612fed42659506f4e754a1b84d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28 17:56:56 +00:00