StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
64,437 Commits 1 Branch 0 Tags
ebaa5733173f687ed14c0b7aedfa72bcc990138d
Commit Graph

5529 Commits

Author SHA1 Message Date
Yi Kong
1336c0f767 Merge "Revert "Update clang version to clang-r487747"" am: cec8b2c0b7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2464731

Change-Id: I9816aab9c3ea5503131487752651d293c8750cb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-02 09:54:15 +00:00
Yi Kong
cec8b2c0b7 Merge "Revert "Update clang version to clang-r487747"" 2023-03-02 09:25:42 +00:00
Chris Parsons
9402ca881c Add a persistent bazel server between builds 
This feature is toggled on with USE_PERSISTENT_BAZEL, which is off by
default. Those that opt-in will have a bazel server running between
builds (with a 3hr default TTL) which will greatly improve analysis on
subsequent builds. (As Bazel maintains a cache of analysis results).

Bug: 266983462
Test: Manual `m nothing` runs (timing with and without the feature)
Test: New integration test
Test: Presubmits
Change-Id: I3af4948baa0c490e9b87c48ffdbe9f67732586c7
 2023-03-01 23:30:19 -05:00
Cole Faust
376cb23106 Merge "Make SortedStringKeys call SortedKeys" am: ba3a44dd1c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2464793

Change-Id: I3123b2441bf60631b7684febfa4a6aa1295d22e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-02 03:53:01 +00:00
Cole Faust
ba3a44dd1c Merge "Make SortedStringKeys call SortedKeys" 2023-03-02 03:08:28 +00:00
Spandan Das
62f1bbd288 Merge "Support two active sdks in EffectiveVersionString" am: 364c90773e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2464074

Change-Id: Ie969bd1a98ba905342d23b65b0562a8962eea781
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-02 01:39:08 +00:00
Spandan Das
364c90773e Merge "Support two active sdks in EffectiveVersionString" 2023-03-02 00:52:12 +00:00
Cole Faust
195c7819fb Make SortedStringKeys call SortedKeys 
I realized this could work if I make it generic.

Bug: 193460475
Test: m nothing
Change-Id: I2071b4cdbccb642ebdbb1342f7d91e581aab9f0f
 2023-03-01 14:21:30 -08:00
Spandan Das
ffb31afdac Support two active sdks in EffectiveVersionString 
Currently it would return the default one even if the requested one is
an active sdk.

Bug: 270609292
Test: go test ./java
Test: built `rkpdapp` locally in internal and verified that its
targetSdkVersion is U and V
Test: TH

Change-Id: Idb03ff4786ff87fb7911bf31205941618a662404
 2023-03-01 20:11:21 +00:00
Zi Wang
75a38e70df Allowlist merged_txts dependencies and combined_apis type 
Test: m and TH

Bug: 267600251
Change-Id: Ib9bef77ce3f72880125b4a323e6b3631179fd877
 2023-03-01 12:04:22 -08:00
Helen Qin
9ede280375 Revert "Update clang version to clang-r487747" 
Revert submission 2446165-update-clang-r487747

Reason for revert: DroidMonitor-triggered revert due to breakage bug b/271252582 and b/271243811

Reverted changes: /q/submissionid:2446165-update-clang-r487747

Bug: 271252582
Bug: 271243811
Change-Id: I3b5c44982d268b5c6c3db39e7af4d7aa7c6dfbf7
 2023-03-01 19:31:36 +00:00
Sorin Basca
8fcec519ff Merge "Reland^2 "Target Java 17"" am: b0dc477ef7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2438064

Change-Id: Ia97c87f062832a49482c7c9615d78fde5036362a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 07:08:22 +00:00
Sorin Basca
b0dc477ef7 Merge "Reland^2 "Target Java 17"" 2023-03-01 06:20:20 +00:00
Yi Kong
f838a8a4d6 Merge "Update clang version to clang-r487747" am: 29ff4182f5 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2434853

Change-Id: I9cf13db3da14299de930386ce73b9b253c63eccd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 05:16:33 +00:00
Yi Kong
29ff4182f5 Merge "Update clang version to clang-r487747" 2023-03-01 05:02:15 +00:00
Treehugger Robot
631ad00a41 Merge "Replace SortedStringKeys with SortedKeys" am: 0f0d3ce49c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2462193

Change-Id: Ia4153e6fd8bcee6636907fb87c4a8cd61aa2786e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 04:56:32 +00:00
Cole Faust
18994c73f1 Replace SortedStringKeys with SortedKeys 
Now that we have generics.

Bug: 193460475
Test: presubmits
Change-Id: I1594fd8feb505175d5c09c03ef397e5ffd5b09cb
 2023-02-28 16:51:32 -08:00
Alix Espino
c8420f4814 Merge "Revert^2 "refactor of api_levels map for soong injection"" am: 0897df1466 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2456128

Change-Id: I0e8406a1c7d5c2c4597b55fd4bcfec0ab9e336ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-27 15:05:11 +00:00
Jiakai Zhang
f96fd09cac Merge changes from topic "boot-image-mainline" am: 4709929c76 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2434294

Change-Id: Ieaed1e117a7e317f93c6050aec823068b319029e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-27 15:04:00 +00:00
Alix Espino
0897df1466 Merge "Revert^2 "refactor of api_levels map for soong injection"" 2023-02-27 14:10:44 +00:00
Jiakai Zhang
8fe3a415b5 Refactor dexpreopt for boot jars to allow more complex dependencies. 
After this change, the dependency hierachy can be arbitrarily deep. For
example, you can have one boot image that extends another boot image
that extends yet another boot image.

Bug: 269230245
Test: m
Change-Id: I096d0b57bda36b982ecc97378647f9c59071a3bf
 2023-02-24 17:13:54 +00:00
Alix Espino
4fd7e74140 Revert^2 "refactor of api_levels map for soong injection" 
a865f4e905

Change-Id: Ifea020ac83725df7131773ca587c56931f5cdf03
 2023-02-24 14:46:43 +00:00
Matthias Männich
cd45342fb0 Merge "Revert "refactor of api_levels map for soong injection"" am: 199584223a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2453188

Change-Id: I41b0dad64ffa195f1fc7e89d508a0ad9976a78f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 13:59:22 +00:00
Matthias Männich
199584223a Merge "Revert "refactor of api_levels map for soong injection"" 2023-02-24 09:48:05 +00:00
Treehugger Robot
9bdba901bb Merge "Add information about what module produced a certain androidmk entry" am: 50ffead8fe 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2454749

Change-Id: Ibdd163d260b50b1c6f09537b56d1aa0a6e91b30a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 08:29:19 +00:00
Treehugger Robot
50ffead8fe Merge "Add information about what module produced a certain androidmk entry" 2023-02-24 04:39:39 +00:00
Cole Faust
39aabe94b9 Add information about what module produced a certain androidmk entry 
For easier debugging.

Bug: 254205429
Test: Presubmits
Change-Id: I54fc53dd3b4f32eb3e4458386aa6caa5b76dbb5b
 2023-02-23 16:57:43 -08:00
Alix Espino
c14ab51f39 Merge "temporary unblock for builds using sdkSystem" am: 8393a0fcdc 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2448142

Change-Id: I41ae22f76c137830f7e25a6b90143e2302108e9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 00:14:39 +00:00
Yi Kong
836690b593 Update clang version to clang-r487747 
Test: presubmit
Bug: 264965700
Change-Id: I2db879f4dcc77b606c788b3e3890ed2a3faa6594
 2023-02-23 20:49:59 +00:00
Alix Espino
8393a0fcdc Merge "temporary unblock for builds using sdkSystem" 2023-02-23 20:47:37 +00:00
Alix Espino
9ece38f0b5 Merge "refactor of api_levels map for soong injection" am: d3ffe6475e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2435772

Change-Id: Ic6780f152dce2be1fd7aac90bb51284ac7237f5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 19:13:35 +00:00
Matthias Männich
a865f4e905 Revert "refactor of api_levels map for soong injection" 
Revert submission 2441746-api_levels_refactor

Reason for revert: broke Android kernel build tools build: https://ci.android.com/builds/branches/aosp_kernel-build-tools/grid?

Reverted changes: /q/submissionid:2441746-api_levels_refactor

Change-Id: I35206879b93ec95ae325025cb764c6c34880dccf
 2023-02-23 17:10:27 +00:00
Alix Espino
d3ffe6475e Merge "refactor of api_levels map for soong injection" 2023-02-23 16:35:35 +00:00
Yu Liu
6f6abe34d1 Merge "Only apply apex transition to DCLA libs for now." am: 995a3a192f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2449906

Change-Id: Ib7f45430cce41a261afdbc035b48d077c0e23085
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 03:42:31 +00:00
Yu Liu
bfb2362cde Only apply apex transition to DCLA libs for now. 
Bug: 270339610
Test: mixed_droid.sh
Change-Id: I6a8b7fdefeb504a25256e92647de9b487d5b65a3
 2023-02-22 10:43:46 -08:00
Treehugger Robot
5a183c9e6a Merge "Allowlist frameworks/hardware/interfaces/stats/aidl" am: 14584beec6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2447862

Change-Id: Icf2144aa2d84396e88fc965193fc22d83ca4c51e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 05:22:27 +00:00
Treehugger Robot
14584beec6 Merge "Allowlist frameworks/hardware/interfaces/stats/aidl" 2023-02-22 04:10:01 +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
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
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
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
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
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
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
Treehugger Robot
46fa42c54c Merge "Add com.android.adbd and adbd_test to AOSP prod allowlist." am: ec8f7543f6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2355102

Change-Id: Ic906782b30596a49d8ea53ae6f1be0c6fd0431bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-16 12:28:40 +00:00
Treehugger Robot
ec8f7543f6 Merge "Add com.android.adbd and adbd_test to AOSP prod allowlist." 2023-02-16 12:23:52 +00:00
Jingwen Chen
98bf5cca87 Add com.android.adbd and adbd_test to AOSP prod allowlist. 
Test: presubmits
Bug: 260617515
Fixes: 260617515
Change-Id: Iadfd5ec2793d98d90c4be6a30ff706735327c299
 2023-02-16 07:58:10 +00:00
Treehugger Robot
5e1919e9bb Merge "Add Always_use_prebuilt_sdks into variableProperties" am: 9fca81a6ec 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2428254

Change-Id: I938f4246bfe0afc1a52643fd24c27af70a883fdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-16 01:27:06 +00:00