Commit graph

73308 commits

Author SHA1 Message Date
Treehugger Robot
2ed2b35f77 Merge "Sandbox nos genrules" into main am: 75f20f38b1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2817729

Change-Id: I0febe40feddc279ce7ee1b9d4d162f4721d5cf26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-07 19:42:39 +00:00
Treehugger Robot
75f20f38b1 Merge "Sandbox nos genrules" into main 2023-11-07 19:10:19 +00:00
Anton Hansson
971881fcd8 Merge "Add a new flag to stop disabling lint errors" into main am: bf3e32d870
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2816560

Change-Id: Ide1642cb3cd7af65d2898fd09ae41afb3f04b0ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-07 16:30:12 +00:00
Anton Hansson
bf3e32d870 Merge "Add a new flag to stop disabling lint errors" into main 2023-11-07 16:01:29 +00:00
Ludovic Barman
f7235c9df5 Merge "Rust protobuf 2->3: Update build system" into udc-dev-plus-aosp 2023-11-07 13:58:30 +00:00
Anton Hansson
fd1c0d2eaa Add a new flag to stop disabling lint errors
java_sdk_library has historically suppressed a few legitimate lint
errors. Make it possible to remove these suppressions via a flag.

Bug: 306806877
Test: checkapi
Merged-In: I10577dacbd7ea8063c6e1e02f3b6c60a2bee5094
Change-Id: I10577dacbd7ea8063c6e1e02f3b6c60a2bee5094
2023-11-07 10:14:50 +00:00
Colin Cross
e3bf3e8292 Merge "Revert "Add support for PRODUCT_RELEASE_CONFIG_MAPS"" into main am: 216ed6c918
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2818083

Change-Id: I40b4d1e733d97bf9ccac780572d975d322d3afe5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-06 22:47:37 +00:00
Colin Cross
216ed6c918 Merge "Revert "Add support for PRODUCT_RELEASE_CONFIG_MAPS"" into main 2023-11-06 22:02:50 +00:00
Colin Cross
6a4fe68cc5 Revert "Add support for PRODUCT_RELEASE_CONFIG_MAPS"
Revert submission 2815850-product-flags

Reason for revert: b/309477343

Reverted changes: /q/submissionid:2815850-product-flags

Bug: 302593603
Bug: 309477343
Change-Id: I5b5a5ade1d85195c43377ed7639deba6eef86e23
2023-11-06 21:32:03 +00:00
LaMont Jones
2ccbaa2f9b Merge "Add support for PRODUCT_RELEASE_CONFIG_MAPS" into main am: 4c01bb49da
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2816262

Change-Id: I44445daa6b82be718f20aaac3b8ae6347361feec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-06 14:37:14 +00:00
LaMont Jones
4c01bb49da Merge "Add support for PRODUCT_RELEASE_CONFIG_MAPS" into main 2023-11-06 14:08:22 +00:00
Alyssa Ketpreechasawat
5d7eb95911 Merge "Disable verify_overlaps test instead of hiddenapi check." into main am: 98e555c842
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2816955

Change-Id: Iee26d5b46aa06ac473648ac7ac2f1e04a031af42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-06 11:36:22 +00:00
Alyssa Ketpreechasawat
98e555c842 Merge "Disable verify_overlaps test instead of hiddenapi check." into main 2023-11-06 10:53:31 +00:00
Alyssa Ketpreechasawat
7daf2786b6 Disable verify_overlaps test instead of hiddenapi check.
Disabling hiddenapi check entirely can be dangerous and it might change the
accessibility of @hide Api too. We should only disable verify_overlaps
test which is required for module_sdk and apexes mismatch.

Test: atest CtsInlineMockingTestCases
Bug: 308187068
Bug: 307480026
Change-Id: I44f48e85d802b3a8f2711bc2047bdab721369f08
2023-11-06 09:49:16 +00:00
Ludovic Barman
28216dbe8d Rust protobuf 2->3: Update build system
tldr: remove protobuf2 from Android Rust and upgrade everything to pb3.

These commits update:
- The grpcio rust crate to use protobuf 3
- The build system to always use the new libprotobuf (pb3) instead of the _deprecated variant (for pb2); they also force-enable libprotobuf everywhere, ignoring the use_protobuf3 flag, removes the tests related to pb2
- The following modules, which required syntax changes:
-- packages/modules/Bluetooth
-- device/google/cuttlefish
-- vendor/auto

Bug: 308790516
Test: m rust
Ignore-AOSP-First: must be done in main to upgrade cuttlefish+vendor with the rest all at once
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:7d0783ce22b3d7d369786d4b16067c79c033185b)
Merged-In: I1d07c433aca41ccfe2e710821cf930c413dc12d6
Change-Id: I1d07c433aca41ccfe2e710821cf930c413dc12d6
2023-11-05 09:31:22 +00:00
Cole Faust
9f9921cbc3 Sandbox nos genrules
go/roboleaf-busy-beavers-sandboxing

Bug: 307824623
Test: m nos_app_avb_service_genc++ nos_app_avb_service_genc++_headers nos_app_avb_service_genc++_mock nos_app_identity_service_genc++ nos_app_identity_service_genc++_headers nos_app_identity_service_genc++_mock nos_app_keymaster_service_genc++ nos_app_keymaster_service_genc++_headers nos_app_keymaster_service_genc++_mock nos_app_weaver_service_genc++ nos_app_weaver_service_genc++_headers nos_app_weaver_service_genc++_mock nos_generator_test_service_genc++ nos_generator_test_service_genc++_headers nos_generator_test_service_genc++_mock
Change-Id: Ic2c6ff1bbc0037c59b692fd76c9050521812989e
2023-11-03 16:29:21 -07:00
Cole Faust
a4a923019d Merge "Sandbox LTP genrules" into main am: 74639be8a7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2815887

Change-Id: I54146d83fb4828667b8be1b3307897967f80c02f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-03 20:37:03 +00:00
Cole Faust
74639be8a7 Merge "Sandbox LTP genrules" into main 2023-11-03 20:16:00 +00:00
LaMont Jones
127127b608 Add support for PRODUCT_RELEASE_CONFIG_MAPS
This allows product config to determine what build flags are present in
a product's build, as well as their value.

As product config moves to a declarative specification, this can be
handled with less unnecessary work.

Bug: b/302593603
Bug: b/308849337
Test: manual
Change-Id: If57622059bb7d1c33df7498321db621c0c2d30c0
2023-11-03 19:19:59 +00:00
Almaz Mingaleev
533d55a02c Merge "Add java.util.random to the allowed package list." into main am: 92610e18e2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2807678

Change-Id: Ia9794d749b79ed0c4df0b9f6a13f242994d477eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-03 14:41:09 +00:00
Almaz Mingaleev
92610e18e2 Merge "Add java.util.random to the allowed package list." into main 2023-11-03 14:05:16 +00:00
Michael Stokes
8a1d9b52e5 Merge "Revert "Use R8 for resource shrinking"" into main am: 2e09e68e56
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2816956

Change-Id: Ib92111a8af066ffb5ce339af8ffe49ca29093f0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-03 12:54:11 +00:00
Michael Stokes
2e09e68e56 Merge "Revert "Use R8 for resource shrinking"" into main 2023-11-03 12:12:40 +00:00
Treehugger Robot
0bc844d4e6 Merge "Update checkapi error message to provide more guidance" into main am: 0978d6a4b1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2816954

Change-Id: I80c1e849ff89b747d94740590197eb8c63be597a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-03 11:43:17 +00:00
Treehugger Robot
0978d6a4b1 Merge "Update checkapi error message to provide more guidance" into main 2023-11-03 11:13:02 +00:00
Rico Wind
a9fd59a7f2 Revert "Use R8 for resource shrinking"
Revert submission 2816534-r8resourceshrinking

Reason for revert: b/309075997

Reverted changes: /q/submissionid:2816534-r8resourceshrinking

Change-Id: Ic173491eaf22967fbad14fbcc85f6ddb2cf54d23
2023-11-03 10:26:38 +00:00
Rico Wind
cb5d4a3649 Merge "Use R8 for resource shrinking" into main am: 4ea88503e4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2813214

Change-Id: I522bc28069400f644faf13f2782630423ad7f0c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-03 08:11:47 +00:00
Rico Wind
4ea88503e4 Merge "Use R8 for resource shrinking" into main 2023-11-03 07:29:45 +00:00
Cole Faust
9cae593d97 Sandbox LTP genrules
gen_ltp_config used to read files from the source tree,
but this cl refactors it to package all the files it
needs into the tool itself, so it's more hermetic and
all the genrules don't need to explicitly list the files
the tool needs.

go/roboleaf-busy-beavers-sandboxing

Bug: 307824623
Test: diff'd the files produced by the ltp_config_* genrules before/after this change
Change-Id: Ia72084965dcb8659394068b7c6877adb1c882dc2
2023-11-02 22:23:01 -07:00
Treehugger Robot
776615811e Merge "Sandbox test apex genrules" into main am: 66135a79f4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2816478

Change-Id: Ia52f3460aacf033776ffcc0f8fcfa9a1c0cd75c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-03 02:18:24 +00:00
Treehugger Robot
e8ce8ba499 Merge "Remove retrieveLegacyEncodedBootDexFiles" into main am: 81ac6e74df
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2816477

Change-Id: I496675d16c6d15443e191a4c80fa6ec604daf52f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-03 02:18:10 +00:00
Treehugger Robot
c1ae53fdef Merge "Remove UpdatableSystemFontTest modules from sandboxing denylist" into main am: ac8052b61f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2816476

Change-Id: I74792b8daece068554e18ce22a9d319d8b4013a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-03 02:17:40 +00:00
Treehugger Robot
66135a79f4 Merge "Sandbox test apex genrules" into main 2023-11-03 02:11:36 +00:00
Treehugger Robot
81ac6e74df Merge "Remove retrieveLegacyEncodedBootDexFiles" into main 2023-11-03 01:46:13 +00:00
Treehugger Robot
ac8052b61f Merge "Remove UpdatableSystemFontTest modules from sandboxing denylist" into main 2023-11-03 01:36:55 +00:00
Cole Faust
06e73446de Sandbox test apex genrules
With the other cls in this topic, the modules build with sandboxing.
They still fail the genrule_sandobox_test.py because their builds are
non-deterministic though. I wasn't able to find the cause of the
non-determinism, so relying on presubmits to make sure nothing breaks.

Bug: 307824623
Test: m com.android.apex.test.bar_stripped com.android.apex.test.baz_stripped com.android.apex.test.foo_stripped com.android.apex.test.pony_stripped com.android.apex.test.sharedlibs_generated com.android.apex.test.sharedlibs_secondary_generated with sandboxing enabled
Change-Id: I4006732bf1ba08e846dee2e18d89dbf45f2cd7ba
2023-11-02 18:08:20 -07:00
Spandan Das
3e75cfa795 Remove retrieveLegacyEncodedBootDexFiles
Seems to be an unused function

Test: TH
Change-Id: Ic0b352afc16ccaf450dadb5b13d9fb6c694e72e6
2023-11-03 00:46:29 +00:00
Jihoon Kang
3ea6467c1c Update checkapi error message to provide more guidance
With from-text stub feature, checkapi is also used for checking the
sanity of the stubs. Therefore, this change adds more explanatory
message about how the user can rebuild the target when their build
failed with stub validation after local API change.

Test: m nothing
Bug: 309027703
Change-Id: If7c9c287266f3da82edde663619b9f08ee05530d
2023-11-03 00:40:26 +00:00
Cole Faust
f45290a496 Remove UpdatableSystemFontTest modules from sandboxing denylist
These modules actually work fine with sandboxing, they were just added
to the list because they have non-deterministic outputs, which caused
the genrule sandboxing script to think that sandboxing affected their
outputs.

Bug: 307824623
Test: ./build/soong/tests/genrule_sandbox_test.py UpdatableSystemFontTest_NotoColorEmojiV0.sig UpdatableSystemFontTest_NotoColorEmojiV0.ttf UpdatableSystemFontTest_NotoColorEmojiVPlus1.sig UpdatableSystemFontTest_NotoColorEmojiVPlus1.ttf UpdatableSystemFontTest_NotoColorEmojiVPlus2.sig UpdatableSystemFontTest_NotoColorEmojiVPlus2.ttf with aosp/2816385
Change-Id: I07b1df779c8d47ad875a4fc2d3af5e46945cff83
2023-11-02 17:15:23 -07:00
Jooyung Han
7e23a55102 Merge changes from topic "unwanted-transitive-deps" into main am: 26464230a1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2812759

Change-Id: Ia1314ea27eb5779e51cf96174c1aaa995d8587b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-02 23:25:46 +00:00
Jooyung Han
26464230a1 Merge changes from topic "unwanted-transitive-deps" into main
* changes:
  Enable dup check for test apexes
  Add apex.unwanted_transitive_deps property
2023-11-02 23:05:14 +00:00
Treehugger Robot
78a6d83458 Merge "Optimize out empty path components" into main am: c012b631ae
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2804377

Change-Id: I34276d669dea477228010b531f4f8470e6747c41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-02 22:52:08 +00:00
Treehugger Robot
c012b631ae Merge "Optimize out empty path components" into main 2023-11-02 22:36:11 +00:00
Colin Cross
bf9ed3fba2 Optimize out empty path components
filepath.Join("foo", "") returns a newly allocated copy of "foo",
while filepath.Join("foo") does not.  Strip out any empty path
components before calling filepath.Join.

Test: TestValidatePath
Change-Id: Ib47dbcd9d6463809acfe260dfd9af87ea280b4de
2023-11-02 14:37:21 -07:00
Rico Wind
b56fe2825d Use R8 for resource shrinking
We are moving the resource shinking pipeline into r8 (gennerally, not just for platform)

This disables the usage of the resource shrinker cli from cmd-line tools

Bug: 308710394

Test: Existing, validated that resource table on SystemUI was byte<>byte equal.
Change-Id: Ia36b5e5970cbdcff519a5f05d672b44dc145ea32
2023-11-02 20:35:20 +01:00
Colin Cross
2488ed09f7 Don't call android.PathForModuleSrc(ctx).String() to get ModuleDir am: f96b001064
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2806397

Change-Id: Ic17bea5bfe5362592b96860d76e9e7f2c9c61522
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-02 19:24:57 +00:00
Colin Cross
f96b001064 Don't call android.PathForModuleSrc(ctx).String() to get ModuleDir
ctx.ModuleDir is much cheaper than android.PathForModuleSrc(ctx).String().

Test: builds
Change-Id: I81819088d9564b06a0336a59a45f2b110b0bd9d6
2023-11-02 19:07:49 +00:00
Anas Sulaiman
165ae98f42 Merge "fix potential encoding issues in remote actions" into main am: 4e6c3ef59b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2814456

Change-Id: Ie29583d6c620ff13963f2ff40296161c4f686caa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-02 18:23:20 +00:00
Treehugger Robot
d33a5ff424 Merge "Remove pre singletons" into main am: 717e7769ce
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2813820

Change-Id: I6791c36bfc1902b9d91fe39cd4fb9b4a6313884e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-02 18:22:30 +00:00
Anas Sulaiman
4e6c3ef59b Merge "fix potential encoding issues in remote actions" into main 2023-11-02 18:21:57 +00:00