StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
66,864 Commits 1 Branch 0 Tags
fbaad8dc50d88fd99d3a14d91ff92c681dfbe522
Commit Graph

5671 Commits

Author SHA1 Message Date
Zi Wang
fbaad8dc50 Merge "Incorporate Bazel-built fingerprint file into mixed builds" into udc-dev 2023-03-07 23:32:17 +00:00
Zi Wang
76889ce00a Incorporate Bazel-built fingerprint file into mixed builds 
Test: m and TH

Bug: 268337233
Ignore-AOSP-First: merge conflict resolutions
Change-Id: Ib2f7fa35b2d94972869e8e85be47b288ff875408
 2023-03-07 13:34:02 -08:00
Wei Li
ea1c8bd414 Export Soong module type to LOCAL_SOONG_MODULE_TYPE to Make for SBOM generation. am: 598f92d704 am: 261721421f am: 13d1319456 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2374715

Change-Id: I97bdbaed3fd5df6411f7817c18c972ccc25bb6f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 21:21:44 +00:00
Liz Kammer
f253f40ca0 Merge "Migrate overlapping config var defs in all bp file" am: edec71adae am: ebe523c177 am: b808a83319 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2472144

Change-Id: I5601044d5a8334b4c0bd21706d3ca277ade2d75c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 21:14:21 +00:00
Treehugger Robot
934ae08220 Merge "soong: Add Cortex-A32 definitions" am: 80ebd72995 am: 5963f06818 am: 8ab4bf80f1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2470067

Change-Id: I512f3b9b0a7febd27cc15a24f0d574d1c78dee9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 20:33:22 +00:00
Zi Wang
9dfd95f0c9 Merge "Allowlist merged_txts dependencies and combined_apis type" am: 1841e5d023 am: 1bc028dbc0 am: 12c62fc748 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2439360

Change-Id: I434d881abe8aa6741922f9d094b62f062169ed59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 20:27:23 +00:00
Wei Li
261721421f Export Soong module type to LOCAL_SOONG_MODULE_TYPE to Make for SBOM generation. am: 598f92d704 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2374715

Change-Id: I707631cba7423523563c327d73c4b27b9070533a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 03:25:06 +00:00
Alix Espino
15879fb1ba Merge "removing codegen_cli from Bp2buildKeepExistingBuildFile" am: f229654372 am: 301e587515 am: 4cb00c46aa 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2467464

Change-Id: I25cff6b4dc97d17465886d8346acff42a828598e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 00:57:44 +00:00
Wei Li
598f92d704 Export Soong module type to LOCAL_SOONG_MODULE_TYPE to Make for SBOM generation. 
Bug: 266726655
Test: CI

Change-Id: If5b1a77930a591b6061ca2749c9c5ad29b4491fb
 2023-03-06 22:51:03 +00:00
Liz Kammer
ebe523c177 Merge "Migrate overlapping config var defs in all bp file" am: edec71adae 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2472144

Change-Id: I8006e3112b7b65977d7e2582352fa2bd06221bf2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-06 22:15:35 +00:00
Liz Kammer
edec71adae Merge "Migrate overlapping config var defs in all bp file" 2023-03-06 21:39:52 +00:00
Treehugger Robot
5963f06818 Merge "soong: Add Cortex-A32 definitions" am: 80ebd72995 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2470067

Change-Id: Ibb2f773e79edbae3609a200f397f9ced31991aaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-06 18:00:09 +00:00
Treehugger Robot
80ebd72995 Merge "soong: Add Cortex-A32 definitions" 2023-03-06 17:26:20 +00:00
Zi Wang
1bc028dbc0 Merge "Allowlist merged_txts dependencies and combined_apis type" am: 1841e5d023 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2439360

Change-Id: Ia207e04c3a62e9675d4716af763d290caf9d9220
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-06 17:06:52 +00:00
Zi Wang
1841e5d023 Merge "Allowlist merged_txts dependencies and combined_apis type" 2023-03-06 16:28:45 +00:00
Liz Kammer
8103dc428e Migrate overlapping config var defs in all bp file 
Unlike most module types, config variable handling is always namespaced
to the Android.bp file, which limits reuse of the variable definitions.
Additionally multiple of these module types can define a string variable
in the same config namespace, but specify different valid values for the
string.

Previously, we cached the first instance we see of variable + namespace;
however, this caused non-determinism in which defintion would be used
and not migrating all values. Instead, we now only cache within a single
Android.bp file where the variable definitions are re-used.

Test: go tests
Bug: 271481817
Change-Id: Ic327657c508e47a705bacd24712a1916e105c7cd
 2023-03-06 09:15:36 -05:00
Jesus Sanchez-Palencia
de7c7847e7 soong: Add Cortex-A32 definitions 
Add definitions for the Cortex-A32 CPU. This is an aarch32 only ARMv8-A
core. See more here https://developer.arm.com/Processors/Cortex-A32 .

Test: added new minidroid target using this CPU variant and built
Change-Id: Id2351a43b9c6cb9785ef469b8c13fadd8b6324b8
Signed-off-by: Mark Slevinsky <markslevinsky@google.com>
Signed-off-by: Jesus Sanchez-Palencia <jesussanp@google.com>
 2023-03-03 14:14:03 -08:00
Alix Espino
157ffc341e Merge "Comments to keep Starlark/soong api logic in sync" am: 04a0ee54de am: 60a7c32bff am: 79557bc1c3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2467465

Change-Id: I73546b41921ddf9a477cbd60881bcb942285e86b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-03 18:07:29 +00:00
Spandan Das
5d4c8cc5d7 Use default format in print statement am: c52e2c00e6 am: c16b7c11a7 am: 42d62f3ae9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2466347

Change-Id: Ie6e1fe4aa98317b81bfe7542b13320d701a80f4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-03 18:03:15 +00:00
Alix Espino
301e587515 Merge "removing codegen_cli from Bp2buildKeepExistingBuildFile" am: f229654372 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2467464

Change-Id: I8609809320823cd047ef342906e582b1eadc0758
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-03 17:45:34 +00:00
Alix Espino
60a7c32bff Merge "Comments to keep Starlark/soong api logic in sync" am: 04a0ee54de 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2467465

Change-Id: Ib10516badf099f482c1daa54d9da5e8d2266329b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-03 17:37:07 +00:00
Spandan Das
c16b7c11a7 Use default format in print statement am: c52e2c00e6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2466347

Change-Id: Iaf63c3f1cc63857d270f8e01e845065dc2532f5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-03 16:56:56 +00:00
Alix Espino
f229654372 Merge "removing codegen_cli from Bp2buildKeepExistingBuildFile" 2023-03-03 16:39:22 +00:00
Alix Espino
04a0ee54de Merge "Comments to keep Starlark/soong api logic in sync" 2023-03-03 14:54:09 +00:00
Spandan Das
c52e2c00e6 Use default format in print statement 
For some reason, %q complains when the test is run outside m

Test: go test ./android
Change-Id: I1a6571feb59f342c9645b998ea2f01ff0a581e90
 2023-03-02 23:47:16 +00:00
Alix
fb7f7b99ff Comments to keep Starlark/soong api logic in sync 
Test: none, added comments
Change-Id: I706c516a3601716a439bd775666a93b63c5c4f27
 2023-03-02 19:36:51 +00:00
Alix
9d5627963b removing codegen_cli from Bp2buildKeepExistingBuildFile 
can allowlist instead. bp2build now handles kotlin srcs

Change-Id: I0f96eb50cbb5bd2c6dc69f253b1a35cfd4edecf2
Test: built codegen_cli with bazel
Bug: b/245731902
 2023-03-02 19:03:56 +00:00
Christopher Parsons
35539a6609 Merge "Add a persistent bazel server between builds" am: 7720f5704c am: cf72dcb178 am: 39b3e9ca9e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2454765

Change-Id: I4a55097a83004c61ffaa3bd77f29c0ef982690a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-02 16:12:56 +00:00
Christopher Parsons
cf72dcb178 Merge "Add a persistent bazel server between builds" am: 7720f5704c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2454765

Change-Id: Id0dfab952bcb3a204deb552d221613135586f95a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-02 14:57:49 +00:00
Christopher Parsons
7720f5704c Merge "Add a persistent bazel server between builds" 2023-03-02 14:22:34 +00:00
Yi Kong
d3c658cd78 Merge "Revert "Update clang version to clang-r487747"" am: cec8b2c0b7 am: 1336c0f767 am: 80145c6536 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2464731

Change-Id: Ie93a237dc3349d79374044cb656fa3bfec9da338
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-02 11:06:45 +00:00
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
Cole Faust
c6e55dc7bd Merge "Make SortedStringKeys call SortedKeys" am: ba3a44dd1c am: 376cb23106 am: 50b4c6e60f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2464793

Change-Id: I4b431dc85dccb310b0f406273fd7586580445597
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-02 05:06:40 +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
f2aa409c01 Merge "Support two active sdks in EffectiveVersionString" am: 364c90773e am: 62f1bbd288 am: ae1eb7135a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2464074

Change-Id: Ia6b81459a97ab1cd73b70ef9c1284c99bfc6cb59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-02 02:55:11 +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
790574484a Merge "Reland^2 "Target Java 17"" am: b0dc477ef7 am: 8fcec519ff am: a98b719472 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2438064

Change-Id: Ia819bceff5218c94e94845f6db7846fa810b1883
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 08:23:12 +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
Yi Kong
dab6fce69c Merge "Update clang version to clang-r487747" am: 29ff4182f5 am: f838a8a4d6 am: fe47748e38 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2434853

Change-Id: I5ae0aaef400066ae07a20808ab74ca4ed501b61a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 06:32:52 +00:00
Treehugger Robot
d7c3eb61d8 Merge "Replace SortedStringKeys with SortedKeys" am: 0f0d3ce49c am: 631ad00a41 am: 155ae26780 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2462193

Change-Id: I9e1a9be24bee47ba43d3807ac90efa786dc1b4bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 06:31:57 +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