Commit graph

73306 commits

Author SHA1 Message Date
Bob Badour
9ee7d03e1c compliance package policy and resolves
package to read, consume, and analyze license metadata and dependency
graph.

Bug: 68860345
Bug: 151177513
Bug: 151953481

Change-Id: Ic08406fa2250a08ad26f2167d934f841c95d9148
2021-12-03 15:52:48 -08:00
Bob Badour
a99ac620dd compliance package structures for license metadata
package to read, consume, and analyze license metadata and dependency
graph.

Bug: 68860345
Bug: 151177513
Bug: 151953481
Change-Id: I3ebf44e4d5195b9851fd076161049bf82ed76dd2
2021-12-03 15:52:48 -08:00
Colin Cross
4f8dd6fe45 Reuse license metadata files from Soong
Copy the license metadata files from Soong if they've already
been built.

Bug: 207445310
Test: m checkbuild
Change-Id: I142c192843e94b018079809bd596ff81136b2de3
2021-12-03 22:47:11 +00:00
Colin Cross
52a0c97e5a Revert "Revert "Move meta_lic files into per-module intermediates directories""
This reverts commit e41ad14f58.

Change-Id: I77211030b657b894002a1a1bded773b3c4b0334a
2021-12-03 22:46:20 +00:00
Daeho Jeong
99f5c768c7 Add erofs tools in target
Bug: 201685920
Test: mm fsck.erofs
Signed-off-by: Daeho Jeong <daehojeong@google.com>
Change-Id: I43ebe6c40c705526e205a08fe8fcd34d265d0245
2021-12-03 19:37:46 +00:00
Jiyong Park
e414a733cb Merge "Reland: Add NEED_AIDL_NDK_PLATFORM_BACKEND" am: 160149e42d
Original change: https://android-review.googlesource.com/c/platform/build/+/1902831

Change-Id: I311adebfd0e51ee56a6d6c16b6f82093863880df
2021-12-03 11:17:57 +00:00
Jiyong Park
160149e42d Merge "Reland: Add NEED_AIDL_NDK_PLATFORM_BACKEND" 2021-12-03 10:56:52 +00:00
Cole Faust
f1f49bb910 Pass input variables to product config
Passing variables via a makefile instead of
rblf_cli / rblf_env allows us to give them correct
types while converting the makefile to starlark,
as opposed to the variables always being strings
when given via rblf_cli / rblf_env.

This also allows us to remove some hand-converted
starlark code.

Bug: 201700692
Test: ./out/soong/rbcrun ./build/make/tests/run.rbc
Change-Id: I58c4f20b29171c14e5ae759beb26a849426f6961
2021-12-02 20:47:31 -08:00
Colin Cross
d821c63926 Merge "Revert "Move meta_lic files into per-module intermediates directories"" am: ccb353501d
Original change: https://android-review.googlesource.com/c/platform/build/+/1908224

Change-Id: Iffd05ce12c5338ebc545e6f3789431beae569bca
2021-12-03 01:06:06 +00:00
Colin Cross
ccb353501d Merge "Revert "Move meta_lic files into per-module intermediates directories"" 2021-12-03 00:46:31 +00:00
Colin Cross
e41ad14f58 Revert "Move meta_lic files into per-module intermediates directories"
This reverts commit 44858d35ce.

Reason for revert: b/208892388

Change-Id: I058e988a8949ed9aa1fac086a69b37a053681982
2021-12-03 00:44:23 +00:00
Jared Duke
2819a5beed Add Soong variable for optimizing system Java
Introduce a Soong variable to allow selective enabling of Java
optimizations for platform targets. This will be used initially
to control optimizations (and shrinking) for system server + sysui.

Opting in to optimizations can be achieved with either:
  * Env:
export SYSTEM_OPTIMIZE_JAVA=true
  * Make:
$(call add_soong_config_var_value,ANDROID,SYSTEM_OPTIMIZE_JAVA,true)

Note that the actual framework build rule changes to hook into this
variable will land separately.

Bug: 203088572
Test: `SYSTEM_OPTIMIZE_JAVA=true m` (observe env variable change log)
Change-Id: I959985bdff394c2445cb1632116846a8d2f5443d
2021-12-02 15:56:10 -08:00
Colin Cross
d24ec61b85 Merge "Move meta_lic files into per-module intermediates directories" am: dd93bd5b72
Original change: https://android-review.googlesource.com/c/platform/build/+/1906234

Change-Id: Id0864e473fc41db29f41284006858495476a26a9
2021-12-02 23:15:01 +00:00
Colin Cross
dd93bd5b72 Merge "Move meta_lic files into per-module intermediates directories" 2021-12-02 22:54:05 +00:00
Treehugger Robot
e802f38861 Merge "Remove 26.0 and 27.0 compat support" am: 5a0cef1c00
Original change: https://android-review.googlesource.com/c/platform/build/+/1904274

Change-Id: I299faad441b394d731b7ec0526b0954dfe995c1a
2021-12-02 06:46:29 +00:00
Treehugger Robot
5a0cef1c00 Merge "Remove 26.0 and 27.0 compat support" 2021-12-02 06:26:58 +00:00
Pirama Arumuga Nainar
49f052d155 [cc/sanitize] Re-enable new pass manager for fuzzer targets
Bug: http://b/133876586

This was turned off but the upstream change fixing this has been long
part of the Android toolchain.

Test: Output of
  m aidl_parser_fuzzer; readelf aidl_parser_fuzzer | grep -c sancov
hasn't changed.

Change-Id: I1d5f9c94cebad74ee00adc1290bbf425bb5c4cd3
2021-12-01 20:50:38 -08:00
Jiyong Park
c99f65fa6c Reland: Add NEED_AIDL_NDK_PLATFORM_BACKEND
The config variable is used to force the generation of the AIDL
ndk_platform backend which will eventually be removed in favor of the
ndk backend. The switch is needed as an escape hatch for some devices
whose BSP (outsourced and thus hardly modifiable) depends on the
ndk_backend libraries.

Bug: 161456198
Test: m

Merged-In: Iba8633263ae649af783e94b01f5c1b5c6e042948
Change-Id: I8b73a6a1e5169c35daf333316857b3c3b110a0f7
2021-12-02 13:16:13 +09:00
Cole Faust
c8305d10b7 Merge "Strip more board config variables" am: b3eb2087df
Original change: https://android-review.googlesource.com/c/platform/build/+/1905890

Change-Id: Ia50a0ef99f533612a8b4cc3c33df424983b1566c
2021-12-01 23:50:07 +00:00
Cole Faust
b3eb2087df Merge "Strip more board config variables" 2021-12-01 23:30:32 +00:00
Treehugger Robot
109643a5cc Merge "Add 32.0 to PLATFORM_SEPOLICY_COMPAT_VERSIONS" am: b5373a9845
Original change: https://android-review.googlesource.com/c/platform/build/+/1906151

Change-Id: I1d8b4d2c3212d2235c278a951d7808a4a1294068
2021-12-01 23:25:54 +00:00
Treehugger Robot
b5373a9845 Merge "Add 32.0 to PLATFORM_SEPOLICY_COMPAT_VERSIONS" 2021-12-01 23:10:38 +00:00
Cole Faust
15ff08eaa4 Merge "Correctly copy the board configuration input variables" am: f900cb4c12
Original change: https://android-review.googlesource.com/c/platform/build/+/1905476

Change-Id: I490a30c0978fb7aed58492977b26e64d10504f86
2021-12-01 22:56:22 +00:00
Colin Cross
44858d35ce Move meta_lic files into per-module intermediates directories
Store the meta_lic files in the per-module intermediates directories
to avoid conflating multiple variants for the same module, for example
host and device.

Bug: 207445310
Test: m checkbuild
Change-Id: I2b0ca22c1f7b069f79d2026707be3294c488f6de
2021-12-01 14:38:13 -08:00
Cole Faust
f900cb4c12 Merge "Correctly copy the board configuration input variables" 2021-12-01 22:37:09 +00:00
Kelvin Zhang
37d4929586 Explicitly set EROFS compression parameter
OTA will need to know the compression parameter used to construct EROFS
images. Currently, mkfs.erofs uses lz4hc,9 if the user didn't specify
one. But mkfs's default behavior is subject to change in future
versions. Therefore, explicitly specify the compression parameters so
OTA tooling can properly encode/decode erofs images.

Test: th
Change-Id: Ibbf67502827ee79437b766349be289048e685759
2021-12-01 14:21:24 -08:00
Colin Cross
0238985e0f Merge "Remove duplicate includes of BUILD_NOTICE_FILE" am: 3db143c452
Original change: https://android-review.googlesource.com/c/platform/build/+/1906235

Change-Id: Ic30b2455c2155cac186caf032ddc66e09fbb5488
2021-12-01 22:02:23 +00:00
Colin Cross
3db143c452 Merge "Remove duplicate includes of BUILD_NOTICE_FILE" 2021-12-01 21:08:12 +00:00
Cole Faust
3be5b72ad6 Correctly copy the board configuration input variables
dict(**h[0]) was only copying the top level dictionary
object, but not any other dictionaries/lists inside of
it. This was causing us to not find all the changes to
variables the board configuration was making, and so
some variables were not included in the output.

Bug: 201700692
Test: ./build/bazel/ci/rbc_regression_test.sh mainline_system_x86_64-userdebug
Test: ./out/soong/rbcrun ./build/make/tests/run.rbc
Change-Id: I4467eead7e597f6f49119a8c4832126f39d646e7
2021-12-01 11:06:23 -08:00
Tianjie Xu
1cdcb088bb Merge "Revert "Temporarily remove the care_map in the ota package"" am: fab626b7d0
Original change: https://android-review.googlesource.com/c/platform/build/+/1907490

Change-Id: I71ab1328f8082659385b0471c5b2ee93786fbc34
2021-12-01 18:38:14 +00:00
Tianjie Xu
fab626b7d0 Merge "Revert "Temporarily remove the care_map in the ota package"" 2021-12-01 18:23:41 +00:00
Jiakai Zhang
4207daaf8e Merge "Add a variable to specify standalone system server jars." am: 1ecb2f952c
Original change: https://android-review.googlesource.com/c/platform/build/+/1874113

Change-Id: I1ba1cedc1da159c654675f7895e31c4ac8d6e92a
2021-12-01 12:37:48 +00:00
Kedar Chitnis
517ac35b68 Merge "Add dumpstate device AIDL HAL packages to target/product/gsi/current.txt" am: 161c7aa777
Original change: https://android-review.googlesource.com/c/platform/build/+/1894958

Change-Id: I5f891e113b6a88136bf710f550f1e6edda01e981
2021-12-01 12:30:31 +00:00
Jiakai Zhang
1ecb2f952c Merge "Add a variable to specify standalone system server jars." 2021-12-01 12:29:37 +00:00
Kedar Chitnis
161c7aa777 Merge "Add dumpstate device AIDL HAL packages to target/product/gsi/current.txt" 2021-12-01 12:16:33 +00:00
Tianjie Xu
2f76f90616 Revert "Temporarily remove the care_map in the ota package"
This reverts commit 5856cfbf82.

Reason for revert: re-enable care_map b/205541521

Change-Id: I64b4637991a80c9d08a28bdd324c47b4067b1762
2021-12-01 05:54:27 +00:00
David Anderson
965ca0d965 Merge "build_image: Query the actual image size after invoking the final mkfs." am: 0096a750c2
Original change: https://android-review.googlesource.com/c/platform/build/+/1889816

Change-Id: Id05c93d2115fdb6d0e83fe6bf271cb325d18cdb9
2021-12-01 03:49:03 +00:00
David Anderson
0096a750c2 Merge "build_image: Query the actual image size after invoking the final mkfs." 2021-12-01 03:28:10 +00:00
Treehugger Robot
52057e2add Merge "Define $(PRODUCT_OUT) before running the board config" am: 9118768352
Original change: https://android-review.googlesource.com/c/platform/build/+/1906551

Change-Id: Ib04008cd88fc38ce8cf83cfecd52e3ebe6ff921a
2021-12-01 01:37:17 +00:00
Treehugger Robot
9118768352 Merge "Define $(PRODUCT_OUT) before running the board config" 2021-12-01 01:15:53 +00:00
Treehugger Robot
68a38e8e95 Merge "Embed zucchini version info in target_files" am: a9bc0e1db5
Original change: https://android-review.googlesource.com/c/platform/build/+/1906834

Change-Id: I448ed55d3ae30bcadc64893753330ce5f19d0fbe
2021-11-30 23:57:42 +00:00
Treehugger Robot
a9bc0e1db5 Merge "Embed zucchini version info in target_files" 2021-11-30 23:35:29 +00:00
David Anderson
009d6f8c73 build_image: Query the actual image size after invoking the final mkfs.
It's not guaranteed that the requested image size to mkfs is precisely
respected, due to metadata alignment and such. For accurate care maps
use the real image size rather than requested.

Bug: 205541521
Test: smartsync to 7892270, check that care_map.pb has the right block
      count
Change-Id: I60fe64f720db13d3c3c4f1d8968341d7293217c9
2021-11-30 15:13:56 -08:00
Cole Faust
29bb6132c8 Strip more board config variables
These variables' values show up in the command line
of certain build commands, so they need to be stable
to have stable ninja files.

The starlark board configuration strips these variables,
causing a discrepency between the starlark and make
versions of board configuration.

Bug: 201700692
Test: ./build/bazel/ci/rbc_regression_test.sh beagle_x15-userdebug
Change-Id: Id053435409821a3fe5997c07610ef835e0c83112
2021-11-30 14:00:57 -08:00
Colin Cross
143af9284f Remove duplicate includes of BUILD_NOTICE_FILE
Some module types include BUILD_NOTICE_FILE a second time after
the include from base_rules.mk.  This won't work after a future
change, and doesn't seem to be necessary as none of the files
leave any modified LOCAL* variables in place for notice_files.mk
to read.

Bug: 207445310
Test: m checkbuild
Change-Id: I8c68888d6bf26926f5c2216abe147ccf28ddc2b8
2021-11-30 13:20:01 -08:00
Colin Cross
fa4dece05a Merge "Make SOONG_HOST_OUT an alias for HOST_OUT" am: 6013329bff
Original change: https://android-review.googlesource.com/c/platform/build/+/1897199

Change-Id: If74d1933ed080729c69de2fe2f76283102dab413
2021-11-30 20:47:12 +00:00
Kelvin Zhang
c06f0627c3 Embed zucchini version info in target_files
external/zucchini/version_info.h contains version info for zucchini
diffing algorithm. OTA tools will use these version info to check for
compatibility and determine if zucchini can be used safely. Owners of
zucchini agreed to keep the format of version_info.h stable so it's
parser friendly.

Bug: 194237829
Test: m dist
Change-Id: If8e37533933b346d3f03adab9263679910ab328c
2021-11-30 12:38:39 -08:00
Colin Cross
6013329bff Merge "Make SOONG_HOST_OUT an alias for HOST_OUT" 2021-11-30 20:31:26 +00:00
Cole Faust
52e5d9c776 Define $(PRODUCT_OUT) before running the board config
Certain board configurations reference $(PRODUCT_OUT)
through deferred expansion, which will no longer work
after conversion to starlark.

Bug: 201700692
Test: build/bazel/ci/rbc_regression_test.sh -b yukawa-userdebug
Change-Id: I02055f5c4a05e540c1752d5964d4db4306292c3b
2021-11-30 11:24:33 -08:00
Jiakai Zhang
44ffb21e53 Add a variable to specify standalone system server jars.
This is the list of jars that system_server loads dynamically using
separate classloaders. We will rely on this variable to decide which
jars to preopt in the build system and on the device for system_server.

The list is supposed to be in sync with the code in SystemServer.java.
There will be a follow-up CL to add a comment in SystemServer.java to
remind developers to keep them in sync.

Bug: 203198541
Test: m nothing
Change-Id: I305a73218ef2d2c61ac3795d21026b2afe7007fd
2021-11-30 11:07:37 +00:00