StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
70,424 Commits 1 Branch 0 Tags
fd584ebb51df3631bcb199b25d2e1fe5c41d1bb9
Commit Graph

6370 Commits

Author SHA1 Message Date
Treehugger Robot
fd584ebb51 Merge "Allowlist additional deps of inputflinger" into main am: cc8c8e5f8d am: a6f7d19d2c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2643053

Change-Id: I8b9f1c816bb5454a8e73672004c8c640cc883e74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-21 22:14:52 +00:00
Zi Wang
f362600dc8 Merge "java_test macro needs srcs and deps to create .jar for tradefed_test_suite" into main am: 8348ce92f5 am: 1c29688852 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2660942

Change-Id: I6dc51ffab3ef187cff433975096fa55088c273d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-21 22:13:00 +00:00
Treehugger Robot
cc8c8e5f8d Merge "Allowlist additional deps of inputflinger" into main 2023-07-21 21:03:39 +00:00
Zi Wang
8348ce92f5 Merge "java_test macro needs srcs and deps to create .jar for tradefed_test_suite" into main 2023-07-21 20:48:13 +00:00
Treehugger Robot
57073321bf Merge "Add CFI product config variables to platform_mappings" into main am: 00d0d7af7d am: 110f8b4a08 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2660958

Change-Id: I138ab0e844dc8bc22327ec53c2af6d0883b3898a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-20 21:07:33 +00:00
Treehugger Robot
00d0d7af7d Merge "Add CFI product config variables to platform_mappings" into main 2023-07-20 19:31:41 +00:00
Cole Faust
88c8efb18c Add CFI product config variables to platform_mappings 
Bug: 269577299
Fixes: 283130542
Test: b test --config=android //build/bazel/rules/cc/...
Change-Id: I2fc4094167c48b1f3b22bee6b7ada309278f7250
 2023-07-20 09:45:36 -07: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
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
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
Treehugger Robot
e2cfe50279 Merge "Fix typo in mutator name" into main 2023-07-20 01:30:58 +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
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
Romain Jobredeaux
0ccd94cefa Merge "Keep rules_java vendored repository BUILD files" into main 2023-07-19 23:22:11 +00:00
Spandan Das
950091ce29 Fix typo in mutator name 
Change-Id: I1aa249e0c2095afb3bdd6eb9f1da62f75607b261
Test: N/A
 2023-07-19 22:26:37 +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
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
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
cfcd0a4960 Merge "make android.InList generic" into main 2023-07-19 15:02:56 +00:00
Liz Kammer
0a681989ae Merge "Handle static binary repetition of system deps" into main 2023-07-19 14:16:52 +00:00
Treehugger Robot
3a553cb013 Merge "Add workaround for a file with an mtime in the future" into main am: b7c8d3d708 am: 36e482d953 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2663376

Change-Id: I78e95574249bd2b361eabd412def80c5913ca423
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-19 06:12:59 +00:00
Treehugger Robot
b4df366727 Merge "Install VNDK libraries into vendor or product lib with flag" into main am: 7d34640ac8 am: 4fc627b005 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2648170

Change-Id: I82dad8ed453f526a7199182c0b73fc496b3dc329
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-19 06:12:42 +00:00
Treehugger Robot
b7c8d3d708 Merge "Add workaround for a file with an mtime in the future" into main 2023-07-19 05:22:28 +00:00
Treehugger Robot
7d34640ac8 Merge "Install VNDK libraries into vendor or product lib with flag" into main 2023-07-19 04:44:51 +00:00
Cole Faust
e9ae480a82 Add workaround for a file with an mtime in the future 
Bug: 291828210
Test: `m` repeatedly, and see ninja say there's no work to do on the second run
Change-Id: I0e1e5a82ebd25e9eec5daea90eb72db0ac085f34
 2023-07-18 19:36:41 -07:00
Sam Delmerico
1717b3bb7a make android.InList generic 
Change-Id: Ic166216cb473371a5e34cd97a068ca35f5534740
 2023-07-18 15:07:24 -04:00
Cole Faust
4b7519d350 Merge "Platform mapping-based product config" into main am: 66ef2ff97f am: b74818b55d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2629193

Change-Id: Ide489f3f500783cace7981aadf492bb235cde236
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-18 18:14:28 +00:00
Kiyoung Kim
e623c58cc6 Install VNDK libraries into vendor or product lib with flag 
Install VNDK libraries into vendor or product lib when flag
'KEEP_VNDK' is set as false from build. This flag will be used to
test while deprecating VNDK step by step.

Bug: 290157355
Test: build succeded with DEPRECATE_VNDK succeded
Test: Cuttlefish boot succeded with sepolicy disabled
Change-Id: I05b166f054113ae2775df4e310916d0ea4af3fb6
 2023-07-18 02:02:57 +00:00
Zi Wang
7873f613c4 java_test macro needs srcs and deps to create .jar for tradefed_test_suite 
Test: java_test_host_conversion_test.go and TH

Bug: 280452825
Change-Id: Ibf0c7eed415fc58a4d228f0347ab125fdc4466e4
 2023-07-17 16:39:07 -07:00
Cole Faust
f8231dd0ea Platform mapping-based product config 
This allows us to set product variables as build settings instead
of loading them from a target's provider, which further allows us
to read product config variables in transitions.

Bug: 287539062
Bug: 269577299
Test: Presubmits
Change-Id: I8497703f706162572ceb3486240e1eb02a37f5f6
 2023-07-17 16:27:08 -07:00
Spandan Das
dc66ec3c65 Merge "Add missing formatting directive" into main am: e61a0817f6 am: 012c363b2b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2657400

Change-Id: I2ff59356e1bf3c32825de01b8fe9e4e49a7e92d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 18:02:54 +00:00
Spandan Das
d73f82aebd Merge "Cleanup an unused variable in rule_builder" into main am: 1181ca2be3 am: 6e2c437e1e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2657401

Change-Id: Id5034657f8b7445eb1e14e3700681ce6135cd24a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 18:02:40 +00:00
Spandan Das
e61a0817f6 Merge "Add missing formatting directive" into main 2023-07-14 16:24:05 +00:00
Spandan Das
1181ca2be3 Merge "Cleanup an unused variable in rule_builder" into main 2023-07-14 16:19:27 +00:00
Jiakai Zhang
47ee73173c Add a Make variable that overrides configured jar locations. am: 4d90da29a8 am: a701f676d9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2655304

Change-Id: I070a444d947d0e028d111abf7077e55acaf1489e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 13:56:47 +00:00
Jiakai Zhang
a701f676d9 Add a Make variable that overrides configured jar locations. am: 4d90da29a8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2655304

Change-Id: If54785cc69a8fd40a7022342c0a726a0212a0686
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 12:26:06 +00:00
Jiakai Zhang
a1140990a1 Merge changes from topics "art-boot-image-jars", "configured-jar-location-overrides" into main 
* changes:
  Add a Make variable to determine ART boot image jars for testing.
  Add a Make variable that overrides configured jar locations.
  Refactor dexpreopt for boot jars to make it flexible to config changes.
 2023-07-14 11:47:59 +00:00
Jiakai Zhang
4d90da29a8 Add a Make variable that overrides configured jar locations. 
We had hardcoded logic to override "framework-minus-apex", but we need
to override more jars, so this CL adds a general solution for this.

Bug: 290583827
Test: m nothing
Change-Id: I211ebda7aa2803886ab6e6d081d26327665e49a6
 2023-07-14 12:13:30 +01:00
Spandan Das
af4ccaaf41 Add functionality to sandbox mixed build actions 
The use case for this is for building rules_go's root builder which runs
into issues when built in a directory that contains a symlink to
prebuilts/go

The implementation will involve two changes of working dir
- `sbox` to change the working directory to
__SBOX_SANDBOX_DIR__
- the generated manifest will change the working
directory to mixed build execution root relative to that

Implemenation details
1. Create a unique intermediate path by hashing the outputs of a buildAction.
   "out/bazel/output/execroot/__main__/" was deliberately not chosen as
   the outpuDir for the sandbox because ruleBuilder would wipe it.
   `sbox` will generate the files in __SBOX_SANDBOX_DIR__ and then place
   the files in this intermediate directory.
2. After the files have been generated in (1), copy them to
   out/bazel/output/execroot/__main__/...
3. For bazel depsets that are inputs of an action, copy the direct
   artifacts into the sandbox instead of the phony target
4. Make sandboxing an opt-in. Currently we will only use it for
   `GoToolchainBinaryBuild`

In the current implementation, (3) will increase the size of the ninja
file. With sboxing turned on for only GoToolchainBinaryBuild, this will
increase the size of the ninja file by around 1.3% on aosp's cf

Test: m com.android.neuralnetworks (will build soong_zip from source
using rules_go)
Test: OUT_DIR=out.other m com.android.neuralnetworks
Bug: 289102849

Change-Id: I7addda9af583ba0ff306e50c1dfa16ed16c29799
 2023-07-14 00:43:52 +00:00
Spandan Das
33e309746e Cleanup an unused variable in rule_builder 
Test: In build/soong, go build ./android
Change-Id: Ic8fad64a95fd2d27c639b0b60c95db47d22bb45b
 2023-07-14 00:34:07 +00:00
Spandan Das
5b18c0ca27 Add missing formatting directive 
Fixes the error
```
fmt.Errorf call has arguments but no formatting directives
```

Test: go test ./android
Change-Id: Ic589d6133ccdc88e77dedd4b8a5a56166f62efa9
 2023-07-14 00:25:02 +00:00
Spandan Das
dd4d7a25f8 Merge changes from topic "go_bp2build" into main am: 06f3c9bb42 am: c16d84cd70 am: 0541f6d7ba 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2655342

Change-Id: Ibc595b732be5735aab8e41fad531bef3cfe80bd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-13 19:04:10 +00:00
Spandan Das
06f3c9bb42 Merge changes from topic "go_bp2build" into main 
* changes:
  Respect package boundaries in bp2build conversion of go modules
  Create a temporary denylist for go binaries used in mixed builds
  Partial bp2build conversion of blueprint_go_binary
  Partial bp2build conversion of bootstratp_go_package
 2023-07-13 16:16:00 +00:00
Spandan Das
0a8a27500e Respect package boundaries in bp2build conversion of go modules 
bp2build's codegen context does not implement
BazelPathConversionContext. To reuse the utility function
transformPackagePaths, update its signature

(Also make deps of go_library unique to make the conversion resilient)

Test: go test ./bp2build
Change-Id: I126b1057d2b26bc6c7d3be2780f1b62d28323cf0
 2023-07-13 00:22:26 +00:00
Jiakai Zhang
eb17813c98 Merge changes I0918f2fa,I3fc6ff91,I7adc97cb,I674a5fa1,I22c45cbf into main am: b898c112a2 am: 12e3b8adcc am: 2c4e719839 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2652086

Change-Id: Ie4445ff5a276cafebbf8e8d09cba8b92646c5ed5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-11 22:18:46 +00:00
Jiakai Zhang
b898c112a2 Merge changes I0918f2fa,I3fc6ff91,I7adc97cb,I674a5fa1,I22c45cbf into main 
* changes:
  Change the profile path on host.
  Extract duplicate code to common helper functions.
  Fix dumpOatRules.
  Remove Modules() from BootclasspathFragmentApexContentInfo.
  Fix some tests for dexpreopt and remove unnecessary tests.
 2023-07-11 20:59:07 +00:00
Jiakai Zhang
b1639db53f Extract duplicate code to common helper functions. 
Also, fall back to using a default name for the dexpreopt directory if
we are not building for Android.

Bug: 290583827
Test: m nothing
Change-Id: I3fc6ff9142a2dcdf995796f75891b242fe2848d0
 2023-07-11 17:59:05 +01:00
Liz Kammer
b492843c3f Handle static binary repetition of system deps 
Test: b build `bmod toybox-static`
Test: go test bp2build tests
Change-Id: Id728f6fd08832a4fc153f0ff5282cdfb6b19c2f6
 2023-07-10 10:28:02 -04:00