StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
80,289 Commits 1 Branch 0 Tags
b22fb3598107e8ec8851f901b03404f24e812d3a
Commit Graph

7613 Commits

Author SHA1 Message Date
Treehugger Robot
5b8fce525a Merge "android_app APEX_GLOBAL_MIN_SDK_VERSION_OVERRIDE" into main am: 8763530dff am: 040d3deedb am: 278c9d0636 am: 6a492430c9 am: 6d5c3d9e73 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2718294

Change-Id: I61823bfe4ac6e6f037a1d26012301bd3efba470d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-07 21:26:15 +00:00
Sam Delmerico
1f9bb26656 allow Ninja variables in RuleBuilder API 
The RuleBuilder API would not expand Ninja variables because the
variables would be written verbatim to the sandbox manifest file. This
commit allows a rule to specify that the manifest file should be written
in an un-escaped format so that Ninja variables are expanded before
writing the manifest file.

Bug: 286077158
Test: rust sandboxing topic + go test
Change-Id: I1915431f6e24d04d343dacc213c9079674ec8251
 2023-09-07 20:56:02 +00:00
Treehugger Robot
c6d011630f Merge "bp2build: block src == name for prebuilt_* modules" into main am: 3f0aa4d618 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2740453

Change-Id: I685e1e8c347ae18b76a288d11c1f4f98e821efa3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-07 19:54:41 +00:00
Treehugger Robot
3f0aa4d618 Merge "bp2build: block src == name for prebuilt_* modules" into main 2023-09-07 19:41:04 +00:00
Cole Faust
1b519e78e7 Re-enable the partition test 
Bug: 299495030
Test: m bazel_sandwich
Change-Id: Ibffc1c0adc858db5bf057ecfa66323c629704656
 2023-09-07 11:57:36 -07:00
Zi Wang
e18ce5337d Allowlist libprotobuf-java-full 
Test: CI

Bug: 299290824
Change-Id: Iee85c63ccc2ebc26bcbc74cce49bfcfb50fed272
 2023-09-07 11:30:25 -07:00
Cole Faust
12db00f363 Tempoarily disable the partition test am: 7dcfeb8100 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2745555

Change-Id: I2d4708aa1a81e25befb529d226833e9e6c551299
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-07 17:20:13 +00:00
Treehugger Robot
040d3deedb Merge "android_app APEX_GLOBAL_MIN_SDK_VERSION_OVERRIDE" into main am: 8763530dff 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2718294

Change-Id: I4d70528e0eda3cdf229c64ddb8cc99eb119015d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-07 17:20:02 +00:00
Cole Faust
7dcfeb8100 Tempoarily disable the partition test 
Bazel doesn't have the new functionality to only pick up correct files
from the staging dir, so it doesn't match make anymore.

Bug: 297269187
Test: m bazel_sandwich
Change-Id: I42e99a30b6e977c628f76457557d823f26446985
 2023-09-07 10:05:42 -07:00
Treehugger Robot
8763530dff Merge "android_app APEX_GLOBAL_MIN_SDK_VERSION_OVERRIDE" into main 2023-09-07 16:55:45 +00:00
Liz Kammer
d5d12d028b bp2build: block src == name for prebuilt_* modules 
src == name causes circular dependency errors, instead mark these as
unconverted and don't create modules for them.

Test: m bp2build and verify boringssl_self_test.zygote64.rc unconverted
Change-Id: I5d5fdd7e14830cd685816064cd0377998d07293c
 2023-09-07 12:26:22 -04:00
Paul Duffin
9fe6ca66b0 Convert Android.bp files in sub-directories of tools/metalava am: cba810e0ac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/24691972

Change-Id: I4bdfa841dabb867cafdb2af033b86a896eed5711
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-07 15:47:53 +00:00
Paul Duffin
88c4600387 Merge "Convert Android.bp files in sub-directories of tools/metalava" into main am: 7d885d53a6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2744734

Change-Id: I2fc086db8e735982e3d7d3a9fc3c114f94cb6268
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-07 14:49:52 +00:00
Paul Duffin
7d885d53a6 Merge "Convert Android.bp files in sub-directories of tools/metalava" into main 2023-09-07 13:55:40 +00:00
Paul Duffin
cba810e0ac Convert Android.bp files in sub-directories of tools/metalava 
Bug: 299428102
Test: m checkapi
(cherry picked from https://android-review.googlesource.com/q/commit:85e33c1cade0af2a1f7cd82370985c29c5029aa1)
Merged-In: Ia01a394ec80e7d760cfb920993807c4006d8c36e
Change-Id: Ia01a394ec80e7d760cfb920993807c4006d8c36e
 2023-09-07 12:48:13 +00:00
Paul Duffin
85e33c1cad Convert Android.bp files in sub-directories of tools/metalava 
Bug: 299428102
Test: m checkapi
Change-Id: Ia01a394ec80e7d760cfb920993807c4006d8c36e
 2023-09-07 12:08:53 +01:00
Cole Faust
bb8ef7d615 Merge "Delete ApiBp2build soong_build mode" into main am: 999881376b am: a861380624 am: 3820cfe980 am: 25cae5f78e am: c50d54270f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2630914

Change-Id: Iebb426aaa2bd802a26ee3e7d2bfaf6074e45b802
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-06 22:06:26 +00:00
Cole Faust
a861380624 Merge "Delete ApiBp2build soong_build mode" into main am: 999881376b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2630914

Change-Id: Iebc3bf754a2d9f504ecff232288ea48a3a84ffbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-06 18:57:36 +00:00
Cole Faust
999881376b Merge "Delete ApiBp2build soong_build mode" into main 2023-09-06 18:04:25 +00:00
Spandan Das
1a392b4cf0 Merge "Add target_compatible_with for compile_multilib" into main am: 6f45900389 am: 6422e4736e am: 779445a5a2 am: 699b51c98e am: c96f6df368 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2741496

Change-Id: Ibb493ec27941552fc7db24a4e4a25517e96a8488
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-06 06:34:25 +00:00
Treehugger Robot
bdb268680c Merge "soong: HWASan exclude path support" into main am: f3d52683a9 am: d24ed92a49 am: 3a5ed146cc am: fadd8932b2 am: 5aae5c20e2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2721423

Change-Id: I658653472fee7289d8e7fe86908f18bffe5a4bc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-06 04:13:59 +00:00
Spandan Das
6422e4736e Merge "Add target_compatible_with for compile_multilib" into main am: 6f45900389 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2741496

Change-Id: I00a0101153e945d2eb9b59e77ce559b589421fe0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-06 04:08:54 +00:00
Spandan Das
6f45900389 Merge "Add target_compatible_with for compile_multilib" into main 2023-09-06 03:29:26 +00:00
Treehugger Robot
03c8b11413 Merge "print module name on allowlist errors" into main am: 922e6adfd2 am: 2d7d8ba64e am: fa670eeae5 am: f177c75e47 am: 690e22f741 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2741113

Change-Id: Iaf18bec629a771a81ca086f930efc9ef80b36d8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-06 02:34:51 +00:00
Treehugger Robot
d24ed92a49 Merge "soong: HWASan exclude path support" into main am: f3d52683a9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2721423

Change-Id: I79f0f214ed7fb87b347736b1e453a53029bac5dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-06 01:46:29 +00:00
Treehugger Robot
f3d52683a9 Merge "soong: HWASan exclude path support" into main 2023-09-06 01:14:12 +00:00
Spandan Das
e1cb14b240 Add target_compatible_with for compile_multilib 
For explicit values of compile_multilib (e.g. 32 or 64), add an
incompatibilty constraint for the arches that do not have the correct
bitness.

Test: go test ./bp2build
Bug: 299135307
Change-Id: I4cd997de6804a5c6d89086d740f773936db1cab9
 2023-09-06 00:31:00 +00:00
Chris Parsons
73f411b72c Delete ApiBp2build soong_build mode 
This feature is obsolete.

This makes a large number of codepaths "dead code" (such as
module-specific implementations of ApiBp2build functionality). These
will be deleted in a followup CL.

Bug: 284029211
Test: Presubmits
Change-Id: Ib53b99f1fe8c24380d219caf44e9bb3b96724fa0
 2023-09-05 17:09:51 -07:00
Treehugger Robot
2d7d8ba64e Merge "print module name on allowlist errors" into main am: 922e6adfd2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2741113

Change-Id: I6268a24db2245e864fad8342a92738fbd01a6f1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-05 23:27:24 +00:00
Treehugger Robot
922e6adfd2 Merge "print module name on allowlist errors" into main 2023-09-05 23:26:31 +00:00
Spandan Das
a54125bd9d Merge "Fix target_compatible_with non-determinism for proto.include_dirs" into main am: 67dc28a93d am: b527a6aa82 am: 5fc61c6f84 am: b3a5bfac44 am: 3249d0493b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2736900

Change-Id: I57b530743a11c44ee15c984c2f2d88a9cd2d6f62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-05 22:43:57 +00:00
Sam Delmerico
0e0d96efa7 android_app APEX_GLOBAL_MIN_SDK_VERSION_OVERRIDE 
Currently the product variable that is controlled by
APEX_GLOBAL_MIN_SDK_VERSION_OVERRIDE only overrides apexes, but it
doesn't apply to android_apps. This commit allows android_apps which set
updatable: true in their Android.bp to have their min_sdk_version be
overriden by this product variable.

Bug: 295311875
Test: go test
Change-Id: If3cb82a17cae4553b577dd1a4637ee13c3c95302
 2023-09-05 21:38:16 +00:00
Sam Delmerico
e42edc369c print module name on allowlist errors 
Change-Id: I34db128d96f8121fed56588a5d6ba7de6e848c9a
 2023-09-05 19:19:19 +00:00
Spandan Das
b527a6aa82 Merge "Fix target_compatible_with non-determinism for proto.include_dirs" into main am: 67dc28a93d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2736900

Change-Id: I7b2d5d88a0f5635f046fd997dfce2d5384166e5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-05 18:10:27 +00:00
Yu Liu
898486656e Merge "Allowlist aapt." into main am: 056d05b690 am: 5dafb27288 am: 1ba6a68432 am: 2e6222f616 am: 21d88f34f8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2736895

Change-Id: I2d7904a6837d1368aac4df1af84c3d760b8cc8b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-01 21:31:48 +00:00
Spandan Das
ab29f57ce6 Fix target_compatible_with non-determinism for proto.include_dirs 
A single proto providing directory can be used by multiple soong modules. Some of these
can be
1. Host specific
2. Device specific
3. Both host and device

Since the generated proto_library can have 1:many mapping, it should
have an empty target_compatible_with. Compatiblity will be enforced at
the top-level {cc|java|python}_proto_library.

(This is a followup to aosp/2727054 which did not handle this correctly)

Test: Added a unit test

Change-Id: I09b3def70e3d043fd8ba0d1eb4ffff1910f097d1
 2023-09-01 21:30:29 +00:00
Yu Liu
5dafb27288 Merge "Allowlist aapt." into main am: 056d05b690 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2736895

Change-Id: I6f6504971d0e299adfcdc7805f35c521ec8da491
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-01 18:08:37 +00:00
Yu Liu
056d05b690 Merge "Allowlist aapt." into main 2023-09-01 17:22:28 +00:00
Inseob Kim
31be3734ef Merge "Remove code about mixed sepolicy build" into main am: 9c14e725e7 am: e06a2b2880 am: 4afb4219a8 am: fb294bd432 am: 9aaed54837 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2735214

Change-Id: I697213198ac692eccc48e5c76748e63a7dc9268a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-01 04:52:52 +00:00
Inseob Kim
e06a2b2880 Merge "Remove code about mixed sepolicy build" into main am: 9c14e725e7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2735214

Change-Id: Ibe4a164f7db10e775b1e7f4f57682bb4b71759cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-01 01:33:44 +00:00
Inseob Kim
9c14e725e7 Merge "Remove code about mixed sepolicy build" into main 2023-09-01 01:06:29 +00:00
Treehugger Robot
c74e3b04a0 Merge "Use aquery results to determine if a file should be executable" into main am: a4fc68a355 am: e304013941 am: 7f8b06bd98 am: a5e4c0d821 am: 48aeba86b7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2736023

Change-Id: I767875e5f534a0468c0e3d2a2095d49fb647dd5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-01 00:48:33 +00:00
Yu Liu
a06f869dd2 Allowlist aapt. 
Bug: 297409580
Test: CI
Change-Id: Ia1b0c65146109d8fca76e47221960f98307a52ec
 2023-08-31 16:30:07 -07:00
Treehugger Robot
e304013941 Merge "Use aquery results to determine if a file should be executable" into main am: a4fc68a355 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2736023

Change-Id: Ide57aa2520e30314ded344e5c1e02a21e059804c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 21:25:19 +00:00
Treehugger Robot
a4fc68a355 Merge "Use aquery results to determine if a file should be executable" into main 2023-08-31 20:51:42 +00:00
Spandan Das
a3a3b5e93d Merge "Replace sync.Mutex with Sync.Map" into main am: 854865736e am: a3703abd5d am: cad53f19fe am: 0d8b90e178 am: bf6da3d883 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2734955

Change-Id: Ibb2cb90f18429717506b6927945bd66ee41dbd34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 20:23:47 +00:00
Sam Delmerico
b45c844ce7 add rust_toolchain_rustc_prebuilt module type 
Sandboxing the rust rules requires having explicit inputs for the rust
toolchain. This module type makes the rustc prebuilt and its
dependencies explicit as a module that can be depended on by all rust
rules.

Bug: 286077158
Test: rust sandboxing topic + go test
Change-Id: If2b80b32e329e6a6ee11ba824de868cf04714553
 2023-08-31 18:03:33 +00:00
Cole Faust
20f2030e29 Use aquery results to determine if a file should be executable 
Now that aquery includes this information.

Also added rm -f $out to some rules, because since they write files
by shell redirection, if the file existed before and was executable,
they wouldn't make the file non-executable and visa versa.

Fixes: 297366783
Test: m bazel_sandwich
Change-Id: Ie5b6c4275b162601f51deaec9912eea4be16988d
 2023-08-31 11:00:25 -07:00
Spandan Das
a3703abd5d Merge "Replace sync.Mutex with Sync.Map" into main am: 854865736e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2734955

Change-Id: I4440544d423928c1ceeca632def8b3401dfa185b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 17:09:03 +00:00
Inseob Kim
6077b2342c Remove code about mixed sepolicy build 
There is no one actively using mixed sepolicy build, and it made
sepolicy codes too complicated. As we are deprecating mixed build,
removing such code for cleanup.

Bug: 298305798
Test: boot cuttlefish
Change-Id: Icb5071eb1378f8ed83568e4445d7b4d33e29bc46
 2023-08-31 16:49:59 +09:00