StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
73,706 Commits 1 Branch 0 Tags
039d8dfb674057bfdafc702c9438a88d8a09c7fd
Commit Graph

73706 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Colin Cross
039d8dfb67 Move android_library resource handling to Bazel's ResourceProcessorBusyBox 
The R.Java files generated by aapt2 link --no-static-lib-packages
cause scaling problems by combining all resources into every package
listed in a dependencies' AndroidManifest.xml file.  For SystemUI-core
this results in 74 R.java files, each with 76k lines, and takes 20
seconds to compile in javac.

Both AGP and Bazel have workarounds for this that avoid using the
R.java files generated by aapt2, instead generating more efficient
R.class files directly based on the R.txt file.

Bazel uses the ResourceProcessorBusyBox tool that is already present
in our tree to process the resources.  Reuse the same tool in Soong
to create the R.jar.

The more efficient R.class files require modifiying source files
that use incorrect packages to refer to resources.

Ignore-AOSP-First: merge conflict
Bug: 284023594
Test: TestAndroidResourceProcessor
Change-Id: I026073b40dabcfdb10e5d7a52e9348205b0e9a66
 2023-07-20 21:39:37 +00:00
Yu Liu
2c5ed9e9ec Merge "denylist boringssl_test_support before we fully support cc_test_library" into main am: 4c9b3e114b am: 1b24c106a2 am: 5bfb1ba735 am: a1734130c7 am: ed304e3290 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2665790

Change-Id: Ic5b73f6cb6404679daf936caeab1df6367fcc8c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-20 07:43:51 +00:00
Yu Liu
ed304e3290 Merge "denylist boringssl_test_support before we fully support cc_test_library" into main am: 4c9b3e114b am: 1b24c106a2 am: 5bfb1ba735 am: a1734130c7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2665790

Change-Id: I33113e8fd50a454224125cf82db0274c0f2c2fb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-20 07:02:12 +00:00
Yu Liu
a1734130c7 Merge "denylist boringssl_test_support before we fully support cc_test_library" into main am: 4c9b3e114b am: 1b24c106a2 am: 5bfb1ba735 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2665790

Change-Id: I48432c74f36ab51cac69374ef7fdfe197871e21e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-20 06:19:58 +00:00
Yu Liu
5bfb1ba735 Merge "denylist boringssl_test_support before we fully support cc_test_library" into main am: 4c9b3e114b am: 1b24c106a2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2665790

Change-Id: Ib50454a9777fa3c5a1bf96370d5d23244147f927
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-20 05:36:05 +00:00
Treehugger Robot
9f3651e7bc Merge "Fix typo in mutator name" into main am: e2cfe50279 am: 5361b43ddb am: b9c4cf09f7 am: 33ddef6dae am: 6a9453d158 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2665657

Change-Id: I1c69c1c36bef432b4a1cb880188d0fa8caa8c4a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-20 05:34:50 +00:00
Yu Liu
1b24c106a2 Merge "denylist boringssl_test_support before we fully support cc_test_library" into main am: 4c9b3e114b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2665790

Change-Id: I84f821f6c187e071a988a9eedc9e68a116b4b88d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-20 04:54:54 +00:00
Treehugger Robot
6a9453d158 Merge "Fix typo in mutator name" into main am: e2cfe50279 am: 5361b43ddb am: b9c4cf09f7 am: 33ddef6dae 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2665657

Change-Id: I3cae33b28a33fae49d908369cca39be5b558745b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-20 04:52:18 +00:00
Yu Liu
4c9b3e114b Merge "denylist boringssl_test_support before we fully support cc_test_library" into main 2023-07-20 04:16:22 +00:00
Treehugger Robot
33ddef6dae Merge "Fix typo in mutator name" into main am: e2cfe50279 am: 5361b43ddb am: b9c4cf09f7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2665657

Change-Id: I55a1bd9ecd02119b9c28cd193d5f1f0cd71fa9f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-20 03:46:07 +00:00
Treehugger Robot
b9c4cf09f7 Merge "Fix typo in mutator name" into main am: e2cfe50279 am: 5361b43ddb 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2665657

Change-Id: Id833c656ef0d00964637cab5ff3c130c251c463d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-20 03:01:11 +00:00
Romain Jobredeaux
916b0d1caf Merge "Keep rules_java vendored repository BUILD files" into main am: 0ccd94cefa am: 48ed4967a8 am: f4214eaa47 am: cc2fac2764 am: 3a00841a5d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2665780

Change-Id: I21991763b779117c52948726e25de23d01600178
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-20 02:36:58 +00:00
Treehugger Robot
9e8916c34d Merge "Pass declarations as separate arguments" into main am: 55d25a435f am: b75d09dfd6 am: 3e4f9fceb1 am: 31941530d6 am: b9b5bbdc75 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2665976

Change-Id: Ie0b3af0f5c4fe4e30b9dc42582348e0969cdb886
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-20 02:36:40 +00:00
Treehugger Robot
5361b43ddb Merge "Fix typo in mutator name" into main am: e2cfe50279 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2665657

Change-Id: Ie279f6392dcf3ae09fb63e2b4a5d3ca024c7a468
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-20 02:17:30 +00:00
Romain Jobredeaux
3a00841a5d Merge "Keep rules_java vendored repository BUILD files" into main am: 0ccd94cefa am: 48ed4967a8 am: f4214eaa47 am: cc2fac2764 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2665780

Change-Id: I189864e8949b41d38022d89aec266aa0c29a30ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-20 01:53:52 +00:00
Treehugger Robot
b9b5bbdc75 Merge "Pass declarations as separate arguments" into main am: 55d25a435f am: b75d09dfd6 am: 3e4f9fceb1 am: 31941530d6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2665976

Change-Id: I2d09efa28946f4b0f07dd954c682e6332fede333
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-20 01:53:38 +00:00
Treehugger Robot
e2cfe50279 Merge "Fix typo in mutator name" into main 2023-07-20 01:30:58 +00:00
Romain Jobredeaux
cc2fac2764 Merge "Keep rules_java vendored repository BUILD files" into main am: 0ccd94cefa am: 48ed4967a8 am: f4214eaa47 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2665780

Change-Id: I95d8e37c8af23be537e6c27254ae0736b07702e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-20 01:04:44 +00:00
Treehugger Robot
31941530d6 Merge "Pass declarations as separate arguments" into main am: 55d25a435f am: b75d09dfd6 am: 3e4f9fceb1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2665976

Change-Id: Ia339a485011ed6118a887731c27f9ea97a1b0367
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-20 01:04:31 +00:00
Romain Jobredeaux
f4214eaa47 Merge "Keep rules_java vendored repository BUILD files" into main am: 0ccd94cefa am: 48ed4967a8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2665780

Change-Id: I4c0cab5d08887a569c733edb4f99ceb46a381b7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-20 00:21:03 +00:00
Treehugger Robot
3e4f9fceb1 Merge "Pass declarations as separate arguments" into main am: 55d25a435f am: b75d09dfd6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2665976

Change-Id: I2e27cd55d2c442a03dfb41f5ca4a15d3b7bdadb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-20 00:20:50 +00:00
Romain Jobredeaux
48ed4967a8 Merge "Keep rules_java vendored repository BUILD files" into main am: 0ccd94cefa 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2665780

Change-Id: Iaadfe677e6b328d8380e6417fcf6d6b4895dea5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-19 23:39:48 +00:00
Yu Liu
1d03d176a9 denylist boringssl_test_support before we fully support cc_test_library 
Bug: 291962016
Test: CI
Change-Id: I20596fe3f70d0a27b12b39a288df753c0befb891
 2023-07-19 23:39:41 +00:00
Treehugger Robot
b75d09dfd6 Merge "Pass declarations as separate arguments" into main am: 55d25a435f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2665976

Change-Id: Ib6a7eb226f08865b3950d42f6598eb91c2110b27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-19 23:39:33 +00:00
Treehugger Robot
1572db7aa3 Merge "Convert requested SDK version if preview API level" into main am: 12a1f9182d am: 11bc03a14f am: 0af5b13bad am: 58b8b022ff am: aa548038b7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2663339

Change-Id: Idab94fbaae429b9824aa95d2d6b826f1a7d86f67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-19 23:35:14 +00:00
Romain Jobredeaux
0ccd94cefa Merge "Keep rules_java vendored repository BUILD files" into main 2023-07-19 23:22:11 +00:00
Treehugger Robot
55d25a435f Merge "Pass declarations as separate arguments" into main 2023-07-19 23:01:38 +00:00
Treehugger Robot
aa548038b7 Merge "Convert requested SDK version if preview API level" into main am: 12a1f9182d am: 11bc03a14f am: 0af5b13bad am: 58b8b022ff 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2663339

Change-Id: I5bfaa9291de423ab341c2871d70531394e744c9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-19 22:52:29 +00:00
Spandan Das
950091ce29 Fix typo in mutator name 
Change-Id: I1aa249e0c2095afb3bdd6eb9f1da62f75607b261
Test: N/A
 2023-07-19 22:26:37 +00:00
Treehugger Robot
58b8b022ff Merge "Convert requested SDK version if preview API level" into main am: 12a1f9182d am: 11bc03a14f am: 0af5b13bad 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2663339

Change-Id: I7cfd830f7e7ea14ca9ec319705b19ca987b2fefb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-19 22:07:34 +00:00
Spandan Das
bc5b671084 Merge changes from topic "build_go_source_mixed_builds" into main am: 958ca02582 am: 5c1e2af1bf am: 3c796cf5fd am: 7ffb8459ea am: 8b572f382d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2627439

Change-Id: I142ca000155d7fbc6e35c950ec1d12c625a3a3b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-19 22:06:09 +00:00
Treehugger Robot
0af5b13bad Merge "Convert requested SDK version if preview API level" into main am: 12a1f9182d am: 11bc03a14f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2663339

Change-Id: I6d020e20ecd5a6ede0a99f9777689ea17a58268c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-19 21:26:36 +00:00
Spandan Das
8b572f382d Merge changes from topic "build_go_source_mixed_builds" into main am: 958ca02582 am: 5c1e2af1bf am: 3c796cf5fd am: 7ffb8459ea 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2627439

Change-Id: I25d6b5b179945da2018b6d7af960c4036acaa910
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-19 21:23:58 +00:00
Treehugger Robot
11bc03a14f Merge "Convert requested SDK version if preview API level" into main am: 12a1f9182d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2663339

Change-Id: I810dbfae2db8ea47d50a169fbe41b36d7b16408a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-19 20:42:26 +00:00
Spandan Das
7ffb8459ea Merge changes from topic "build_go_source_mixed_builds" into main am: 958ca02582 am: 5c1e2af1bf am: 3c796cf5fd 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2627439

Change-Id: Ie86a59884a2aa6edb0fb34882eb51f27cc5eac79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-19 20:40:48 +00:00
Treehugger Robot
12a1f9182d Merge "Convert requested SDK version if preview API level" into main 2023-07-19 20:05:05 +00:00
Spandan Das
3c796cf5fd Merge changes from topic "build_go_source_mixed_builds" into main am: 958ca02582 am: 5c1e2af1bf 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2627439

Change-Id: I7b22578aff303c6bc402ac5ab597e2190530d4ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-19 19:58:17 +00:00
Romain Jobredeaux
01e6b2c788 Keep rules_java vendored repository BUILD files 
Test: CI
Bug: 291828210
Bug: 287596254
Change-Id: Ic8a3a1966cc82816b74f0efe59c27fae70552c11
 2023-07-19 15:27:13 -04:00
Spandan Das
5c1e2af1bf Merge changes from topic "build_go_source_mixed_builds" into main am: 958ca02582 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2627439

Change-Id: I14e2394b5543e6f19c0ce79ae5ef1e9610a99cc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-19 18:06:25 +00:00
Zhi Dou
8a35a6fa71 Pass declarations as separate arguments 
Aconfig take declarations as separate arguments if there are multiple
declaration files.

Bug: 291926035
Test: build flags
Change-Id: Ic0d069184f48ceaf8947acc5b951eecff7c308f9
 2023-07-19 18:04:24 +00:00
Sam Delmerico
ed85d6398c Merge "make android.InList generic" into main am: cfcd0a4960 am: 351e7c83b8 am: a37e415460 am: e1aea84c1d am: eee5ba0c8f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2660959

Change-Id: Iffbe1c194355917972145f91cb11fad86f6c6c28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-19 17:42:22 +00:00
Liz Kammer
bb91b8747f Merge "Handle static binary repetition of system deps" into main am: 0a681989ae am: ae7094a51b am: 7f0e5b4cc5 am: 07dda86fa0 am: 67df36d848 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2613809

Change-Id: I5b41a69d695992dd65447a2020ef00b38c9c8de6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-19 17:41:54 +00:00
Spandan Das
958ca02582 Merge changes from topic "build_go_source_mixed_builds" into main 
* changes:
  Delete aliases to prebuilts
  Add functionality to sandbox mixed build actions
 2023-07-19 17:21:25 +00:00
Sam Delmerico
eee5ba0c8f Merge "make android.InList generic" into main am: cfcd0a4960 am: 351e7c83b8 am: a37e415460 am: e1aea84c1d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2660959

Change-Id: I163ade3d09cc1a55167298044ba010d9112e9c83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-19 16:59:51 +00:00
Liz Kammer
67df36d848 Merge "Handle static binary repetition of system deps" into main am: 0a681989ae am: ae7094a51b am: 7f0e5b4cc5 am: 07dda86fa0 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2613809

Change-Id: I2c8da220c29d05b3d6238ddc429e67ed325be2be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-19 16:59:05 +00:00
Sam Delmerico
e1aea84c1d Merge "make android.InList generic" into main am: cfcd0a4960 am: 351e7c83b8 am: a37e415460 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2660959

Change-Id: Iefbff8a2900e7d07a3b12236fb5344719fe8d641
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-19 16:16:08 +00:00
Liz Kammer
07dda86fa0 Merge "Handle static binary repetition of system deps" into main am: 0a681989ae am: ae7094a51b am: 7f0e5b4cc5 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2613809

Change-Id: Ib13ec22def45d1c117a7025d94c63f02adb57b0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-19 16:15:52 +00:00
Sam Delmerico
a37e415460 Merge "make android.InList generic" into main am: cfcd0a4960 am: 351e7c83b8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2660959

Change-Id: I3e35aeba5e73185458ec5ee3923773001935ca3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-19 15:31:38 +00:00
Liz Kammer
7f0e5b4cc5 Merge "Handle static binary repetition of system deps" into main am: 0a681989ae am: ae7094a51b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2613809

Change-Id: I3ae7bcb3cbb47e603dcbacb0589980dd1e387775
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-19 15:31:12 +00:00
Sam Delmerico
351e7c83b8 Merge "make android.InList generic" into main am: cfcd0a4960 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2660959

Change-Id: I2a9c17ee76fde7d31ed81608712a2a47c557c47a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-19 15:11:34 +00:00