Commit Graph

64011 Commits

Author SHA1 Message Date
Yiming Jing
548777bdfd Merge "Add an Override_apex_available property for APEX" am: eefa010090
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2447502

Change-Id: I6878696e3d63e800786915b8dedb97dd87474624
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 01:35:56 +00:00
Yu Liu
c07bb5799a Support DCLA am: e43124023c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2393572

Change-Id: Iae2d689e9c09838a82d78d44416e1629dcb03eb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 01:35:44 +00:00
Zijun Zhao
c50ae9c6e2 Revert "Revert "Enable -Wformat-insufficient-args globally""
This reverts commit cc1d984d49.

Reason for revert: Fixed 
https://googleplex-android-review.git.corp.google.com/21522363

https://source.corp.google.com/h/googleplex-android/platform/superproject/+/tm-qpr-dev-plus-aosp:vendor/google/whitechapel/audio/hal/audio_hal/ext_module/amcs_ext/amcs_ext.c;l=266;bpv=1

Change-Id: I79ee06b720f1299ab02cb129baabb3c025c31483
2023-02-22 00:38:28 +00:00
Yiming Jing
eefa010090 Merge "Add an Override_apex_available property for APEX" 2023-02-22 00:33:32 +00:00
Jon Bottarini
a0b44cbd1c spelling/grammar fix
Test: Presubmit
Change-Id: I4522ec1c457c7d98adc2820faa457b2bb7cb517a
Merged-In: I4522ec1c457c7d98adc2820faa457b2bb7cb517a
2023-02-21 13:52:21 -08:00
Vinh Tran
9b09bc5e3a Allowlist frameworks/hardware/interfaces/stats/aidl
This fixes current breakage on aosp-master-bazel on bp2build-incremental. aosp/2401793 addes android.frameworks.stats-V2-ndk to libtestvendoratoms but android.frameworks.stats aidl_interface is not allowlisted yet.

However, `//frameworks/proto_logging/stats/stats_log_api_gen:libtestvendoratoms` is still not building because of another issue in genrule + proto.

```
ERROR: out/soong/workspace/frameworks/proto_logging/stats/stats_log_api_gen/BUILD.bazel:87:8: Executing genrule //frameworks/proto_logging/stats/stats_log_api_gen:test_vendor_atoms.cpp failed: (Segmentation fault): bash failed: error executing command (from target //frameworks/proto_logging/stats/stats_log_api_gen:test_vendor_atoms.cpp) /bin/bash -c ... (remaining 1 argument skipped)i
```

The fix to this is similar to aosp/2401794 and is fixed in aosp/2449265

Test: presubmit
Bug: 270131691
Change-Id: I8bcc336d843ee4f0de44f377c828a9a4c959b0ec
2023-02-21 16:24:00 -05:00
Yu Liu
10174ff208 bp2build of libraries with stubs should handle non-implementation deps
Bug: 266724299
Test: Unit test and manual tests
Change-Id: I7d7641676fbf3d3fae413b27d329a4b05b1cd3bf
2023-02-21 12:07:07 -08:00
Liz Kammer
0cca1a07a9 Merge changes Iab00c839,I5962b27f am: d3c240fbd8 am: e15c77caac
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2431539

Change-Id: Ie1dff8a95f1775b53da0ced6089be3ff934b4249
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-21 19:38:46 +00:00
Alex Márquez Pérez Muñíz Díaz Puras Thaureaux
19f5c2bd12 Merge "Express no{,_lib}crt via features vs attrs" am: 676630b884 am: 88e5c0b4f2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2407553

Change-Id: I0e89dbae1bb9e732e77990f609945020cc06a442
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-21 19:36:01 +00:00
Alix
c566ad8a4f refactor of api_levels map for soong injection
Change-Id: I58449fc84617e46727f23ab3d8dd5f118d2ee0d2
Bug: 249265719
Test: go test ./bp2build and locally ran bazel tests
2023-02-21 18:55:37 +00:00
Liz Kammer
e15c77caac Merge changes Iab00c839,I5962b27f am: d3c240fbd8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2431539

Change-Id: I6198275c8b2245487df04a56398ee70c0e8fcd3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-21 18:34:37 +00:00
Alex Márquez Pérez Muñíz Díaz Puras Thaureaux
88e5c0b4f2 Merge "Express no{,_lib}crt via features vs attrs" am: 676630b884
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2407553

Change-Id: I6a8e85b76671c1097e82caacc0988bec1ab12383
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-21 18:32:31 +00:00
Yu Liu
e43124023c Support DCLA
Bug: 240424572
Test: Manual tests:
1. m --dev-mode-staging com.android.adbd com.android.media.swcodec.
2. verify the DCLA libs from the two apexes have the same size and
   sha1sum, and also match the libs in bazel-out.
3. empty the DCLA libs list in allowlist.go and repeat step 1
4. repeat step 2 and verify the opposite result
5. build git_master: mainline_modules_bundles-userdebug in ABTD
   with the cl, then follow go/build-sideload-dcla-locally to
   download the adbd and swcodec aab files, run the DCLA trimming
   workflow locally, and verify the symlinks in the two trimmed
   apexes are identical and also match the lib path in the DCLA
   apex that was created by the workflow.

Change-Id: Ib2f8a29126a54829c0e10eba17b256a79930fd70
2023-02-21 10:12:47 -08:00
Liz Kammer
d3c240fbd8 Merge changes Iab00c839,I5962b27f
* changes:
  Handle aquery build statements in a goroutine
  Use aquery proto directly
2023-02-21 18:02:42 +00:00
Alex Márquez Pérez Muñíz Díaz Puras Thaureaux
676630b884 Merge "Express no{,_lib}crt via features vs attrs" 2023-02-21 17:28:17 +00:00
Victor Chang
9fc7469558 Merge "Allowlist java.lang.constant in libcore" am: 789e532a04 am: cf8a9a071f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2447062

Change-Id: Iafb19d5996cb94f855c332f672c72050dc15c08e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-21 17:01:41 +00:00
Alix
79f853d7b9 temporary unblock for builds using sdkSystem
Bug: 215230098
Change-Id: I521342c676f3362d3e1db0aab7924a04602525e1
Test:  built captiveportal-lib and inspected BUILD file
2023-02-21 17:01:16 +00:00
Victor Chang
cf8a9a071f Merge "Allowlist java.lang.constant in libcore" am: 789e532a04
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2447062

Change-Id: I0ade04b201aa21dd47d17ec733c49b8e54aaca1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-21 15:59:26 +00:00
Victor Chang
789e532a04 Merge "Allowlist java.lang.constant in libcore" 2023-02-21 14:59:34 +00:00
Treehugger Robot
e0f63aa88d Merge "Fix symlinks from APEX to partitions" am: 4196e13a6a am: 9bd0f928f1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2442922

Change-Id: Id1c19bc3b3462e2f193d79f6f4f59e653055958b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-21 05:39:21 +00:00
Treehugger Robot
9bd0f928f1 Merge "Fix symlinks from APEX to partitions" am: 4196e13a6a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2442922

Change-Id: Iefadf2775084969290aef45b3f4377ec1a4d57b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-21 04:35:26 +00:00
Yiming Jing
dd2c76e772 Add an Override_apex_available property for APEX
This property allows an APEX bundle to ignore the apex_available rules
defined in its dependencies, effectively allowing it to use any APEX
as its dependency.

Bug: 269660351
Test: m
Change-Id: Ib2797e04438ad908ac10b256dce07a7819e836b3
2023-02-20 20:04:14 -08:00
Treehugger Robot
4196e13a6a Merge "Fix symlinks from APEX to partitions" 2023-02-21 03:37:48 +00:00
Victor Chang
7c05d2d185 Allowlist java.lang.constant in libcore
Bug: 270028670
Test: m droid
Change-Id: I7612998fd518442defd5f9f00115e6a16e261b18
2023-02-20 17:27:18 +00:00
Nathan Egge
e2342f10ea Merge "Add JAVAC to the list of env variables to unset." am: c2e385cc4c am: ddf6947daa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2443779

Change-Id: I1328a13265b8902747b042ab51e91f2a68468789
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-18 03:23:04 +00:00
Nathan Egge
ddf6947daa Merge "Add JAVAC to the list of env variables to unset." am: c2e385cc4c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2443779

Change-Id: I692a0cf461f2be0877d0344152f7fec5d3b3bf4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-18 02:22:24 +00:00
Nathan Egge
c2e385cc4c Merge "Add JAVAC to the list of env variables to unset." 2023-02-18 01:40:21 +00:00
Cole Faust
ceca87f514 Merge "Disable RBE in multiproduct_kati" am: 29e7c6fc15 am: dc1fe68c4b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2443740

Change-Id: I4ec46f8abee7e587c8f98312317766d0054c33c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-18 00:54:16 +00:00
Cole Faust
dc1fe68c4b Merge "Disable RBE in multiproduct_kati" am: 29e7c6fc15
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2443740

Change-Id: I2b10b2a24ce711c756ffb7b59d8acc454ab91594
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-17 23:53:07 +00:00
Cole Faust
29e7c6fc15 Merge "Disable RBE in multiproduct_kati" 2023-02-17 22:56:21 +00:00
Cole Faust
81f170f6bc Disable RBE in multiproduct_kati
RBE has signifigant performance overhead during
analysis time, in theory to reduce execution time.
But multiproduct_kati only tests analysis, and does
not run any execution, so RBE is just slowing us
down.

Bug: 229863781
Bug: 265603584
Test: time ./build/soong/build_test.bash  --products aosp_arm64 on stage_aosp_master
Change-Id: Icbb2f001fee03a75bad37c14d08a203be20ac6cf
2023-02-17 11:36:35 -08:00
Alex Márquez Pérez Muñíz Díaz Puras Thaureaux
01ec55ec92 Express no{,_lib}crt via features vs attrs
Given that we can map them directly to disabling the
corresponding Bazel features: `-{link_,use_lib}crt`

Test: Existing (adapted) Unit Tests
Test: bp2build.sh
Change-Id: Ib502f6fb929ace8e86a1001e3cc21f399317500c
2023-02-17 19:24:42 +00:00
Nathan Egge
7b067fb753 Add JAVAC to the list of env variables to unset.
Some linux environments export JAVAC for legacy compatibility and this
 variable must be unset to ensure Soong and Make JAVAC values match.

Test: manual

Change-Id: Iae19fcb91b0a7651cbe00fe50f6daed54b4d7879
2023-02-17 18:07:04 +00:00
Andrea Zilio
0040631342 Merge "Revert "Enable -Wformat-insufficient-args globally"" am: 92ac65952d am: 148ee88912
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2443339

Change-Id: I586bf56b9ccb9b93bdba30f7989aeb715298f8b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-17 14:57:29 +00:00
Andrea Zilio
148ee88912 Merge "Revert "Enable -Wformat-insufficient-args globally"" am: 92ac65952d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2443339

Change-Id: Ie228f2d33f9fd670b0396e834cbde2130349257c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-17 13:56:36 +00:00
Andrea Zilio
92ac65952d Merge "Revert "Enable -Wformat-insufficient-args globally"" 2023-02-17 12:54:59 +00:00
Andrea Zilio
cc1d984d49 Revert "Enable -Wformat-insufficient-args globally"
This reverts commit af8b950357.

Reason for revert: Broke the build, see b/269687118

Change-Id: I6f7fac0e24c710bd00af77e4d96c845eefe0a9ce
2023-02-17 11:51:10 +00:00
Cole Faust
0c93d93cac Merge "Add status messages for RBE and product config" am: d75b47add9 am: 5e0d296673
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2442159

Change-Id: I4f50004a8c862d228a867bee85b3a39ab914e757
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-17 10:00:18 +00:00
Jiyong Park
ce2436302a Fix symlinks from APEX to partitions
Previously, the symlink optimization for APEXes assumed that the target
of the symlinks are in the system partition. The assumption however
doesn't hold always because the file that was added to the APEX might be
with system_ext_specific: true or vendor: true.

Bug: 265598720
Test: m nothing
Change-Id: Ieb9a6769320c0ec697a88c0cae977e7d65288362
2023-02-17 18:22:25 +09:00
Cole Faust
5e0d296673 Merge "Add status messages for RBE and product config" am: d75b47add9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2442159

Change-Id: I898ad04e5e02e4374df6e76be4bf9b92cc9ea5d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-17 09:00:56 +00:00
Cole Faust
d75b47add9 Merge "Add status messages for RBE and product config" 2023-02-17 07:55:40 +00:00
zijunzhao
b7a262359c Enable -Wformat-insufficient-args globally am: af8b950357 am: f961177fc0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2300900

Change-Id: Ia64b0b9b5361a9137efced6420d77d0f38ae7df4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-16 23:57:09 +00:00
zijunzhao
f961177fc0 Enable -Wformat-insufficient-args globally am: af8b950357
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2300900

Change-Id: Ifa9b99fd385ccdb29e2610364ee82aa5a4924a96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-16 23:13:46 +00:00
Cole Faust
64955b32bf Add status messages for RBE and product config
RBE adds a lot of time to m nothing builds,
so add status messages for it so that it's not misattributed
to some other part of the build.

Bug: 269644490
Test: m nothing
Change-Id: Ifff11bfc88f43b559526f3e3d3022c1388e42156
2023-02-16 21:06:19 +00:00
zijunzhao
af8b950357 Enable -Wformat-insufficient-args globally
Bug: b/191699019
Test: m
Change-Id: I6349308d1f8b13e5c5d75b154e8c9b53d9eec4bf
2023-02-16 17:52:22 +00:00
Treehugger Robot
a78d49303f Merge changes I55a5a295,I9c09451d,I05177388 am: c004bf3b7e am: 766f6ac1c3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2426452

Change-Id: I0e2b105c933d0f7ec98a4a12a28a7b81b1462cb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-16 16:35:23 +00:00
Treehugger Robot
766f6ac1c3 Merge changes I55a5a295,I9c09451d,I05177388 am: c004bf3b7e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2426452

Change-Id: I2d98ac125498ab221de002de429247b8ead7a272
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-16 15:53:44 +00:00
Anton Hansson
cdfc3c4fb6 [automerger skipped] Ignore native bridge archs for apex selection am: 144be1f8aa -s ours
am skip reason: Merged-In Ic4a91974290a05b1799f755fcf52ef226d68f4c2 with SHA-1 805e0a53ef is already in history

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

Change-Id: I2766d278ede2386c48e0f80b96ea12fbe5b4d82e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-16 15:52:41 +00:00
Treehugger Robot
c004bf3b7e Merge changes I55a5a295,I9c09451d,I05177388
* changes:
  Use the profiles in the APEX to dexpreopt system server jars.
  Add tests for the ignored "profile_guided: true" property.
  Output dex_preopt to SDK snapshot.
2023-02-16 14:46:19 +00:00
Sam Delmerico
d2aab4b2ca [automerger skipped] extract_apks matches APKs with >= 1 matching ABI am: d706f71090 -s ours
am skip reason: Merged-In If67ce8128099611257a834862295a2bf5fa427d3 with SHA-1 b48d57bdcd is already in history

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

Change-Id: I4c4697f58262a9019f1cf6062c5c93ea5001b336
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-16 14:09:35 +00:00