Commit Graph

5144 Commits

Author SHA1 Message Date
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
edec71adae Merge "Migrate overlapping config var defs in all bp file" 2023-03-06 21:39:52 +00:00
Treehugger Robot
80ebd72995 Merge "soong: Add Cortex-A32 definitions" 2023-03-06 17:26:20 +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
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
7720f5704c Merge "Add a persistent bazel server between builds" 2023-03-02 14:22:34 +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
ba3a44dd1c Merge "Make SortedStringKeys call SortedKeys" 2023-03-02 03:08:28 +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
b0dc477ef7 Merge "Reland^2 "Target Java 17"" 2023-03-01 06:20:20 +00:00
Yi Kong
29ff4182f5 Merge "Update clang version to clang-r487747" 2023-03-01 05:02:15 +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
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
199584223a Merge "Revert "refactor of api_levels map for soong injection"" 2023-02-24 09:48:05 +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
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
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
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
14584beec6 Merge "Allowlist frameworks/hardware/interfaces/stats/aidl" 2023-02-22 04:10:01 +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
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
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
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
9fca81a6ec Merge "Add Always_use_prebuilt_sdks into variableProperties" 2023-02-16 01:03:42 +00:00
Sorin Basca
be302733f6 Reland^2 "Target Java 17"
This reverts commit 91ba6c7e01.

Reason for revert: Relanding Java 17

Change-Id: I6d0e64bb86b9f4a0f41baa33c3226c6316718456
2023-02-15 17:52:27 +00:00
Romain Jobredeaux
477733404d Allowlist metalava and dependencies.
Change-Id: Ief72b982b11db20b82bb4678f0cf87550b9fd9e4
2023-02-15 11:32:39 -05:00
Liz Kammer
a4655a96c0 Handle aquery build statements in a goroutine
Creation of build statements is largely parallelizable because each
action is independent apart from updates/reads to
depsetHashToArtifactPathsCache. Locally resulted in build statements
taking ~.45 seconds on staging mode to ~.02 seconds

Test: CI
Change-Id: Iab00c8394a9eab17353f71230885ff0870e17f24
2023-02-15 11:29:49 -05:00
Zi Wang
c451830446 Merge "Add limited bp2build converter of java_sdk_library" 2023-02-15 02:32:48 +00:00
Treehugger Robot
7ec899ac67 Merge "Fix typo" 2023-02-14 23:51:13 +00:00
Julien Desprez
4d3f11ccb3 Merge "Revert "Reland "Target Java 17""" 2023-02-14 22:21:26 +00:00