Commit Graph

28743 Commits

Author SHA1 Message Date
Colin Cross
6a0f8bb9b4 Merge "Revert "Move meta_lic files into per-module intermediates directories"" am: ccb353501d am: d821c63926
Original change: https://android-review.googlesource.com/c/platform/build/+/1908224

Change-Id: Ief03d7fdb95ebf69dbb721ac6bb75e8bfcff0952
2021-12-03 01:21:36 +00: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
b50dfb7dbf Merge "Move meta_lic files into per-module intermediates directories" am: dd93bd5b72 am: d24ec61b85
Original change: https://android-review.googlesource.com/c/platform/build/+/1906234

Change-Id: I8bfe709d76354b3f97588fa3ab8ebd7b09dc9ef3
2021-12-02 23:29:30 +00: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
4b2b6d9173 Merge "Remove 26.0 and 27.0 compat support" am: 5a0cef1c00 am: e802f38861
Original change: https://android-review.googlesource.com/c/platform/build/+/1904274

Change-Id: I5446f984956881441d4262de28fb7077fc100e54
2021-12-02 07:03:46 +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
ff5540724f Merge "Strip more board config variables" am: b3eb2087df am: c8305d10b7
Original change: https://android-review.googlesource.com/c/platform/build/+/1905890

Change-Id: Ic7d8230160271f4e397d46a8faf73654978aa744
2021-12-02 00:08:38 +00: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
Treehugger Robot
8455d3a36d Merge "Add 32.0 to PLATFORM_SEPOLICY_COMPAT_VERSIONS" am: b5373a9845 am: 109643a5cc
Original change: https://android-review.googlesource.com/c/platform/build/+/1906151

Change-Id: I9175d3fc5d169dc045155e1399edcdbdc4e02afd
2021-12-01 23:43:08 +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
Cole Faust
0f25a409ae Merge "Correctly copy the board configuration input variables" am: f900cb4c12 am: 15ff08eaa4
Original change: https://android-review.googlesource.com/c/platform/build/+/1905476

Change-Id: I06650a685ce6bf8c9325ba3f5c09d5bfbcb1301c
2021-12-01 23:15:08 +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
9b5cb6a6ed Merge "Remove duplicate includes of BUILD_NOTICE_FILE" am: 3db143c452 am: 0238985e0f
Original change: https://android-review.googlesource.com/c/platform/build/+/1906235

Change-Id: I9c635cc792d8df3d3b1721200a9f0dadf6689002
2021-12-01 22:21:24 +00: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
Jiakai Zhang
bfa878e9de Merge "Add a variable to specify standalone system server jars." am: 1ecb2f952c am: 4207daaf8e
Original change: https://android-review.googlesource.com/c/platform/build/+/1874113

Change-Id: I78d1c4e2f39f90263d52aa06d0b1a33466f8918e
2021-12-01 12:43:17 +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
Jiakai Zhang
1ecb2f952c Merge "Add a variable to specify standalone system server jars." 2021-12-01 12:29:37 +00:00
Treehugger Robot
2acb9ac6c3 Merge "Define $(PRODUCT_OUT) before running the board config" am: 9118768352 am: 52057e2add
Original change: https://android-review.googlesource.com/c/platform/build/+/1906551

Change-Id: I60a4e8bd53361744920842df608bf047a3ab871b
2021-12-01 01:53:36 +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
d3e90e46cf Merge "Embed zucchini version info in target_files" am: a9bc0e1db5 am: 68a38e8e95
Original change: https://android-review.googlesource.com/c/platform/build/+/1906834

Change-Id: Id8667496899b6b513450ee71d69b1b7ee2a04eec
2021-12-01 00:14:04 +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
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
04de16ed59 Merge "Make SOONG_HOST_OUT an alias for HOST_OUT" am: 6013329bff am: fa4dece05a
Original change: https://android-review.googlesource.com/c/platform/build/+/1897199

Change-Id: I140f0a901119e41242da8ad52d55728226a39b84
2021-11-30 21:02:44 +00: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
Inseob Kim
e124e3a02d Add 32.0 to PLATFORM_SEPOLICY_COMPAT_VERSIONS
Bug: 206330997
Test: m selinux_policy
Change-Id: Ibbe71843a0ba5677203eabb27690562d55cb057e
2021-11-30 13:44:52 +09:00
Ulyana Trafimovich
ca6e563ad0 Merge "Sort PRODUCT_APEX_BOOT_JARS automatically." am: af78df0553 am: b128e28695
Original change: https://android-review.googlesource.com/c/platform/build/+/1903170

Change-Id: Id22b9a6a233c2a87b7e9e219f4205bb0871a7a1e
2021-11-29 12:17:18 +00:00
Ulyana Trafimovich
b128e28695 Merge "Sort PRODUCT_APEX_BOOT_JARS automatically." am: af78df0553
Original change: https://android-review.googlesource.com/c/platform/build/+/1903170

Change-Id: I82cebfc087ff033f7852c0550fb4568640493021
2021-11-29 12:04:30 +00:00
Ulyana Trafimovich
af78df0553 Merge "Sort PRODUCT_APEX_BOOT_JARS automatically." 2021-11-29 11:46:54 +00:00
Inseob Kim
a6568e00e2 Remove 26.0 and 27.0 compat support
Treble doesn't support T system + O vendor, so removing 26.0 (N) and
27.0 (O) prebuilts and compat files.

Bug: 207815515
Test: build
Change-Id: Ie12737cc5ca8725caf834d9bf1bdfe840ac516c0
2021-11-29 01:29:28 +00:00
Ulya Trafimovich
c9ec59c72a Sort PRODUCT_APEX_BOOT_JARS automatically.
This is a follow-up CL for https://r.android.com/1900565.

This is needed because product makefiles may need to add their own
APEX boot jars, and they cannot insert them in the correct alphabetical
order on the list. So it needs to be sorted automatically. Do this
after processing all product makefiles and populating the variable,
but before passing it to Soong.

Bug: 207474880
Test: lunch aosp_cf_x86_64_phone-userdebug && launch_cvd
      # cuttlefish device boots successfully
Change-Id: I86b58ef8aeac595e401d872f59a2936a67bedeec
2021-11-26 16:02:54 +00:00