Commit graph

80359 commits

Author SHA1 Message Date
Jared Duke
97a9903c3e Refine VisibleForTesting proguard rules
Both androidx (Jetpack) and com.google.common (Guava) define
@VisibleForTesting annotations. These are used within these libraries
for test purposes, but have also been adopted throughout the platform
for platform-specific test code. Consequently, the current keep
rules end up keeping not only platform test code, but also library test
code that isn't actually needed.

Refine these rules by restricting VisibleForTesting-annotated keep
rules to include code *outside* of Jetpack/Guava. A longer term
solution will involve migrating away from these annotations toward
the platform-defined @TestApi and internal @VisibleForTesting variants.
Note that platform code using the androidx* and c.g.common*-defined
@VisibleForTesting annotations will still be kept.

This saves about ~11MB of dex code from platform apps/services.

Bug: 239961360
Test: m + validate dex changes for shrunk packages (SystemUI/Launcher)
Change-Id: Icd70090e615b72a2cfb9ce8c43edb17cb46e05e2
2022-08-03 08:35:45 -07:00
Jooyung Han
0140dfa4b3 Add WIFI_ variables into soong config
To migrate libwifi-hal module from make to soong, WIFI_ make variables
are added to soong config variables in `wifi` namespace.

Bug: 239984067
Test: m libwifi-hal
Merged-In: If60f5909619af887be8e0086a8dfef65dc97cce0
Change-Id: If60f5909619af887be8e0086a8dfef65dc97cce0
(cherry picked from commit 4abb3d43b4baf74cf7b17fee380d5b4c77a2bc9d)
2022-08-03 17:46:07 +09:00
Alexander Smundak
a77df0c808 Merge "Fix go.mod for tools/canoninja" am: 5cf8217978
Original change: https://android-review.googlesource.com/c/platform/build/+/2171782

Change-Id: I3cad683736ec403fbcb1fc0899ee6898480e372e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02 23:02:55 +00:00
Alexander Smundak
5cf8217978 Merge "Fix go.mod for tools/canoninja" 2022-08-02 22:55:16 +00:00
Treehugger Robot
81421fe772 Merge "Revert "Revert "Fix missing notices.""" am: e2325f0ef6
Original change: https://android-review.googlesource.com/c/platform/build/+/2172708

Change-Id: I85f7975e53db2fa982d0baae50fb26bc6ac3d543
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02 22:55:01 +00:00
Treehugger Robot
e2325f0ef6 Merge "Revert "Revert "Fix missing notices.""" 2022-08-02 22:31:57 +00:00
Bob Badour
56e0de5784 Revert "Revert "Fix missing notices.""
This reverts commit 18f8049da1.

Reason for revert: Roll forward with fix

Fix missing notices.

Move ALL_DEFAULT_INSTALLED_MODULES assignments back into Makefile

Fix typos DLMK -> DLKM

Bug: 240582127

Test: m droid dist

Test: tapas google-tradefed-all && m dist

Test: build/soong/soong_ui.bash --make-mode TARGET_PRODUCT=aosp_x86 TARGET_BUILD_VARIANT=eng droid dist checkbuild

Test: build/soong/soong_ui.bash --make-mode TARGET_PRODUCT=aosp_x86_64 TARGET_BUILD_VARIANT=userdebug droid dist checkbuild

Change-Id: If780669602c459c337585e9d2c4915b28844e2bb
Merged-in: If780669602c459c337585e9d2c4915b28844e2bb
2022-08-02 13:11:20 -07:00
Kelvin Zhang
e50bb51fa9 Add flags to override all apex/apk keys
Currently, if we want to override all apex/apk key, we must specify all apk/apex names exhaustively. This causes CLI arguments to be very long and sometimes exceeds OS's limit.

Test: run signing test locally on build 8862875 on git_master
Bug: 239991438
Change-Id: Idbd3b7eef9b2a27236f4ca7a27449fcdf0d2dd3f
2022-08-02 18:32:38 +00:00
Bob Badour
8ddadca927 Merge "Revert "Fix missing notices."" am: 7ec578b20a
Original change: https://android-review.googlesource.com/c/platform/build/+/2172705

Change-Id: Ib5e76e016f7cc4263dc3efd807e115f22003ea70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02 17:47:48 +00:00
Treehugger Robot
79e45e727a Merge "Append built and installed when copying metadata." am: 3fe9459268
Original change: https://android-review.googlesource.com/c/platform/build/+/2169434

Change-Id: Ib2e6411981a213d7e477e105d8efd6783c346f07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02 17:47:13 +00:00
Treehugger Robot
53d7adcba3 Merge "Tune R8 shrinking defaults for system_server" am: 08a46cda1b
Original change: https://android-review.googlesource.com/c/platform/build/+/2169486

Change-Id: I6095b857e17f2142dc99b7d90291b84ea1bbae4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02 17:45:45 +00:00
Bob Badour
7ec578b20a Merge "Revert "Fix missing notices."" 2022-08-02 17:38:39 +00:00
Treehugger Robot
3fe9459268 Merge "Append built and installed when copying metadata." 2022-08-02 17:25:58 +00:00
Treehugger Robot
08a46cda1b Merge "Tune R8 shrinking defaults for system_server" 2022-08-02 17:21:18 +00:00
Henri Chataing
18f8049da1 Revert "Fix missing notices."
This reverts commit 8ef21add49.

Reason for revert: Potential build breakage aosp_x86_64-userdebug, aosp_x86-eng

Bug: 241113403

Change-Id: Ia10a6d43528feb00f874fe80b8aa9ab1aa4ebff2
2022-08-02 17:03:43 +00:00
Treehugger Robot
b192a54ab7 Merge "Fix missing notices." am: d7e72a7e0d
Original change: https://android-review.googlesource.com/c/platform/build/+/2171783

Change-Id: Ib2af9d3e74b33e8dfbeee859b6b655fac5a447a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02 16:06:15 +00:00
Treehugger Robot
d7e72a7e0d Merge "Fix missing notices." 2022-08-02 15:48:26 +00:00
Bob Badour
8ef21add49 Fix missing notices.
Move ALL_DEFAULT_INSTALLED_MODULES assignments back into Makefile

Fix typos DLMK -> DLKM

Bug: 240582127

Test: m droid dist

Test: tapas google-tradefed-all && m dist

Change-Id: I3d1886b017b233528898a42010442f11bbea11df
Merged-in: I3d1886b017b233528898a42010442f11bbea11df
2022-08-01 21:51:52 -07:00
Treehugger Robot
0b96e1a005 Merge "Fix go.mod for tools/compliance" am: f30267635e
Original change: https://android-review.googlesource.com/c/platform/build/+/2169821

Change-Id: Ibf4c760bc46a31512b2bd9ed5e6576b24fcd0479
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02 03:44:13 +00:00
Treehugger Robot
f30267635e Merge "Fix go.mod for tools/compliance" 2022-08-02 03:26:25 +00:00
Cory Barker
8a49a60143 Updated the way we build AFL++ fuzz binaries
Test: Built AFL fuzzers individually and built all using haiku command
and built libfuzzers individually and also by using haiku command. Ran
selected fuzzers manually to ensure fuzzing still worked.

Description: Previously we needed to add cc_afl_fuzz to build an afl fuzz binary,
however, to turn current libFuzzers into AFL fuzzers this would required
an update to each Android.bp file which is a lot of work, and would also
require an approval from each Android.bp file owner, which is even more
work.

To get around this (and also to match how AFL fuzzers are built in G3)
we will build AFL++ fuzz binaries by command line option FUZZ_FRAMEWORK.
When FUZZ_FRAMEWORK=AFL is set, all cc_fuzz modules will be built

Change-Id: I994bde63b759046c9e3d75d3acfdc1352412005b
2022-08-02 02:23:23 +00:00
Android Build Coastguard Worker
f200991b20 Version bump to TP1A.220624.021.A1 [core/build_id.mk]
Change-Id: I7c8493c902491dd966825f86f50a98e94119501e
2022-08-02 00:25:32 +00:00
Sasha Smundak
94d473c5c7 Fix go.mod for tools/canoninja
Now it can be ld with `go build` and cross-referenced.

Test: treehugger
Change-Id: I299efc2d635176519345acf142114097be6bf814
2022-08-01 14:45:28 -07:00
Sasha Smundak
ded9acd86d Fix go.mod for tools/compliance
Now it can be built with `go build`, and can be cross-referenced.

Test: treehugger
Change-Id: Ic35631ff6a915c8cf58db14aa83c849549e64aba
2022-08-01 14:24:21 -07:00
Cole Faust
b102b987a5 Merge "Remove leading whitespace from dump-variables-rbc results" am: 1fabb2a942
Original change: https://android-review.googlesource.com/c/platform/build/+/2162942

Change-Id: I20d01010d7d9f432b13506920ccdf6d849a9df59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-01 17:26:37 +00:00
Cole Faust
1fabb2a942 Merge "Remove leading whitespace from dump-variables-rbc results" 2022-08-01 17:06:32 +00:00
Jared Duke
1687d842d4 Tune R8 shrinking defaults for system_server
Disable R8 shrinking by default if there are additional
SYSTEM_SERVER_JARS that may be downstream from services.jar, or if
the jar ordering is unreliable.

The longer term solution will be to feed R8 the SYSTEM_SERVER_JARS
explicitly during the shrinking phase, but for now this avoids
potential issues with such dowstream jars. Note that specific
products or targets can still opt-in explicitly even if there may be
ordering issues in SYSTEM_SERVER_JARS.

Bug: 240588226,235484969
Test: m + lunch various Arc/Wear/Auto targets
Change-Id: I1d824e1e61de65604123b65b25b192a8a32fd0c1
2022-08-01 09:47:32 -07:00
Bob Badour
04fbe29669 Append built and installed when copying metadata.
Soong doesn't always have the built and installed available.

Bug: 239638693

Test: m droid dist

Change-Id: Id18201da488e3b16d60957c9a298a52345595c5b
2022-07-29 17:16:25 -07:00
Treehugger Robot
30c7aead84 Merge "Fix signapk jar not found for prebuilt splits" am: f6f6c2f8cf
Original change: https://android-review.googlesource.com/c/platform/build/+/2165007

Change-Id: I1ddf2a3db02c2a04440d6bd94b5aef4aea1f75fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-29 23:06:22 +00:00
Treehugger Robot
f6f6c2f8cf Merge "Fix signapk jar not found for prebuilt splits" 2022-07-29 21:55:58 +00:00
Kelvin Zhang
89c59b8fa5 Merge "Fix typo in recently changed extra_apex_payload_key flag" am: 193de78dfd
Original change: https://android-review.googlesource.com/c/platform/build/+/2167622

Change-Id: Ia46cc5f2a651aefc4884d5d642a0c6c04d66a536
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-29 17:08:22 +00:00
Kelvin Zhang
193de78dfd Merge "Fix typo in recently changed extra_apex_payload_key flag" 2022-07-29 16:51:06 +00:00
Treehugger Robot
9de205cbae Merge "Ensure runtime-visible annotations are kept" am: 55d24aeb4c
Original change: https://android-review.googlesource.com/c/platform/build/+/2165010

Change-Id: Ifa186882f50c6c002592d94f530b4bffcfea8e9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-28 16:29:38 +00:00
Treehugger Robot
55d24aeb4c Merge "Ensure runtime-visible annotations are kept" 2022-07-28 15:58:28 +00:00
Android Build Coastguard Worker
8141d08408 Version bump to TP1A.220624.021 [core/build_id.mk]
Change-Id: Ic806bca584fa3f0f885c847620c4f4276261e20c
2022-07-27 20:27:42 +00:00
Kelvin Zhang
87e452739e Fix typo in recently changed extra_apex_payload_key flag
The intention was to make extra_apex_payload_key take a comma separted
list of keys. Iterating over a string will only iterate over each
characters individually. Must split by "," to iterate over keys.

Test: Run signing test locally using tradefed.sh
Bug: 239991438
Change-Id: I51bfed53a43b1b0fc1e33e0dc3d418a727e6ff15
2022-07-27 11:15:58 -07:00
Treehugger Robot
488525a889 Merge "Allow extra_apex_payload_key to take multiple names at once" am: d024518e1e
Original change: https://android-review.googlesource.com/c/platform/build/+/2164515

Change-Id: I0d2545f758d7469cf3a68ccf505a6183306630b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-27 02:04:03 +00:00
Treehugger Robot
d024518e1e Merge "Allow extra_apex_payload_key to take multiple names at once" 2022-07-27 01:42:05 +00:00
Jared Duke
3837a945b7 Ensure runtime-visible annotations are kept
With R8 full mode, these annotations must be explicitly kept as
attributes. Also keep annotation defaults as they may be used at
runtime.

Test: m + presubmit
Bug: 215530220
Change-Id: Ibab630cd8498c5789ebcad6785fda24967df4d61
2022-07-25 16:56:09 -07:00
Kelvin Zhang
085b6f3e84 Allow extra_apex_payload_key to take multiple names at once
When running tests, we might need to add many
extra_payload_keys. Currently we have to add --extra_apex_payload_key
for each key pair we pass, resulting in extremely long argument list.

Test: th
Bug: 239991438
Change-Id: I3e5f9d76c7f45822fb986b603dc089407c35b76b
2022-07-25 16:16:13 -07:00
Sandeep Vijayasekar
9a6d03d55e Fix signapk jar not found for prebuilt splits
Bug: 132211754
Bug: 232129462
Test: prebuild module with LOCAL_PACKAGE_SPLITS defined
Change-Id: If82f06debf092fd5bdf37558d8eea62eb3b72582
(cherry picked from commit 1e3a2c3254)
2022-07-25 14:51:24 -07:00
Android Build Coastguard Worker
5821c51c5d Version bump to TP1A.220624.020 [core/build_id.mk]
Change-Id: I447464b3058d78503c4390ad39838b1a3b0c9e49
2022-07-23 05:25:24 +00:00
Treehugger Robot
6cae23a562 Merge "Remove TARGET_ENABLE_MEDIADRM_64 from BoardConfigGsiCommon.mk" am: 2c3c189da7
Original change: https://android-review.googlesource.com/c/platform/build/+/2155273

Change-Id: If98201de255b5ec80ea66b7e92042a2d16033a42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-22 14:44:12 +00:00
Treehugger Robot
2c3c189da7 Merge "Remove TARGET_ENABLE_MEDIADRM_64 from BoardConfigGsiCommon.mk" 2022-07-22 14:04:17 +00:00
Cole Faust
a1b215cf2a Remove leading whitespace from dump-variables-rbc results
For some reason, some internal products were failing the
quick rbc ci check purely because of indentation differences
in the variable dump file. That file has a lot of wonky
leading indentation due to the foreaches and line breaks
in the function implementation that I couldn't figure
out how to remove. Instead, use a sed command to remove
leading spaces after writing the file.

Bug: 239453560
Test: build/bazel/ci/rbc_dashboard.py --quick on a new internal-only product
Change-Id: I4b34d8e0b5dbbfcbb9ed35345d216ca11a5a1198
2022-07-21 08:08:32 -07:00
Android Build Coastguard Worker
f74a6809e9 Version bump to TP1A.220624.019 [core/build_id.mk]
Change-Id: I3d0c17148088479a56df8a6988ad13a8911b2f12
2022-07-21 03:28:45 +00:00
Android Build Coastguard Worker
9b615fdafb Version bump to TP1A.220624.018 [core/build_id.mk]
Change-Id: I3b4e6491b2bd15667973bf10720cf37f781a76d7
2022-07-20 10:49:25 +00:00
Steven Moreland
53a66ef45d Merge "Let finalize_branch_for_release.sh create ABI dumps" am: 3510fa6d46
Original change: https://android-review.googlesource.com/c/platform/build/+/2157898

Change-Id: Ifbda064dd4596274c6406045a1fdfb9ff2ee63b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-19 16:02:08 +00:00
Steven Moreland
3510fa6d46 Merge "Let finalize_branch_for_release.sh create ABI dumps" 2022-07-19 15:43:53 +00:00
Hsin-Yi Chen
6c2353d7fd Let finalize_branch_for_release.sh create ABI dumps
Bug: 238984913
Test: build/make/finalize_branch_for_release.sh
Change-Id: I0a2e2cfe33464fbe0b4d210e9936a89713059556
2022-07-19 15:44:36 +08:00