Commit graph

80387 commits

Author SHA1 Message Date
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
Treehugger Robot
4482d2ff60 Merge "Allow building super.img on targets without BOARD_BUILD_SUPER_IMAGE_BY_DEFAULT set." am: e8b9724200
Original change: https://android-review.googlesource.com/c/platform/build/+/2147421

Change-Id: I4c24336e0079846d710ca8a0752408af9084f750
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-16 04:14:07 +00:00
Treehugger Robot
e8b9724200 Merge "Allow building super.img on targets without BOARD_BUILD_SUPER_IMAGE_BY_DEFAULT set." 2022-07-16 03:55:40 +00:00
SzuWei Lin
606904d0b8 Remove TARGET_ENABLE_MEDIADRM_64 from BoardConfigGsiCommon.mk
The setting doesn't affect system image.

Bug: 239141283
Change-Id: I210add4cd76797bd181923ad8ec439cb96d0ac7c
2022-07-15 07:56:48 +00:00
Christopher Ferris
46c5088d03 Merge "Add ability to force compile as 64 bit." am: 2c8a0d65b6
Original change: https://android-review.googlesource.com/c/platform/build/+/2151946

Change-Id: Ie11ec8b1267ee9d7f1f54561268f89ca5e7c8432
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14 22:42:50 +00:00
Christopher Ferris
2c8a0d65b6 Merge "Add ability to force compile as 64 bit." 2022-07-14 22:28:37 +00:00
Christopher Ferris
25b2a651d5 Add ability to force compile as 64 bit.
When trying to build a single 64 bit and 32 bit image, there are
a few executables that are prefer32. When set, this will force all
of those targets to be compiled as 64 bit.

Test: With this option, drmserver/mediaserver are built as 64 bit.
Test: Without this option, drmserver/mediaserver are built as 32 bit.
Change-Id: I84f6be7fe0fa3a9ea86ecc4dd785aaf1825f9925
2022-07-14 13:31:51 -07:00
Cory Barker
5a8669d877 Merge "Adding support for building AFLpp Test: Built AFL fuzzers locally and ran them" am: 602b19905c
Original change: https://android-review.googlesource.com/c/platform/build/+/2151557

Change-Id: I9fcc34c735bd90d8acf319a035ef8b1c583c6f97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14 16:45:56 +00:00
Cory Barker
602b19905c Merge "Adding support for building AFLpp Test: Built AFL fuzzers locally and ran them" 2022-07-14 16:26:41 +00:00
Android Build Coastguard Worker
d4f1f84e4a Version bump to TP1A.220624.017 [core/build_id.mk]
Change-Id: Ic190c7409c3e28ac442136db52a11a9037d270a9
2022-07-14 09:41:19 +00:00
Android Build Coastguard Worker
a4992884d4 Version bump to TP1A.220624.016 [core/build_id.mk]
Change-Id: I23d5ebcfbfb18123b7c2e28c21373fff9cd64ff3
2022-07-14 06:17:48 +00:00
SzuWei Lin
dab11d367d Merge "Support dynamic 64-bit media service" am: aba99adea4
Original change: https://android-review.googlesource.com/c/platform/build/+/2144759

Change-Id: I9b5a60c8630a082e72eb1dc803f50b56ad03a2e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14 00:38:17 +00:00
SzuWei Lin
aba99adea4 Merge "Support dynamic 64-bit media service" 2022-07-14 00:20:03 +00:00
Elliott Hughes
3192270f07 Merge "Add support for only starting 64 bit zygote." am: 449986300c
Original change: https://android-review.googlesource.com/c/platform/build/+/2060123

Change-Id: I91a3acd6a55ced408d6f27c3dc8538ae3d929e50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-13 20:19:00 +00:00
Elliott Hughes
449986300c Merge "Add support for only starting 64 bit zygote." 2022-07-13 19:57:47 +00:00
Treehugger Robot
1675ebe0a7 [automerger skipped] Merge "Add permission to the list of individually toggleable modules" am: 8bfd7fa7d6 -s ours
am skip reason: Merged-In Id4eb9ba0da8a05c41d3b29b1cb8fa1d2d485c7b9 with SHA-1 86251a5450 is already in history

Original change: https://android-review.googlesource.com/c/platform/build/+/2151255

Change-Id: I8f1cfd31298085ba4b031047d5b07ed62086acb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-13 19:52:34 +00:00
Paul Duffin
7e74ff5f49 [automerger skipped] Add permission to the list of individually toggleable modules am: 3ec92f2695 -s ours
am skip reason: Merged-In Id4eb9ba0da8a05c41d3b29b1cb8fa1d2d485c7b9 with SHA-1 86251a5450 is already in history

Original change: https://android-review.googlesource.com/c/platform/build/+/2151255

Change-Id: If46ead84417243e3eba93ef126d14ae208ee920f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-13 19:52:32 +00:00
Treehugger Robot
8bfd7fa7d6 Merge "Add permission to the list of individually toggleable modules" 2022-07-13 19:34:19 +00:00
Paul Duffin
86251a5450 Add permission to the list of individually toggleable modules
This is safe even though permission is not an optional mainline
module because devices that support mainline must pass GTS and
testModulesSignedCorrectly and testModulesPreloadedCorrectly in GTS
currently tests this, along with testMainlineApprovedTrain which checks
mandatory/optional, signing keys, and if what's preloaded are part of
approved trains.

Bug: 238175656
Test: # Cherry pick to branch that has Google signed prebuilts for
      # permission and builds from prebuilts by default.
      # Update the permission to an sdk snapshot generated with
      # r.android.com/2151273.
      # Make sure that the permission is built from prebuilts by
      # default
Change-Id: Id4eb9ba0da8a05c41d3b29b1cb8fa1d2d485c7b9
(cherry picked from commit fb72d542ad)
Merged-In: Id4eb9ba0da8a05c41d3b29b1cb8fa1d2d485c7b9
2022-07-13 16:28:57 +00:00
Paul Duffin
3ec92f2695 Add permission to the list of individually toggleable modules
(cherry-picked from fb72d542ad)

This is safe even though permission is not an optional mainline
module because devices that support mainline must pass GTS and
testModulesSignedCorrectly and testModulesPreloadedCorrectly in GTS
currently tests this, along with testMainlineApprovedTrain which checks
mandatory/optional, signing keys, and if what's preloaded are part of
approved trains.

Bug: 238175656
Test: # Cherry pick to branch that has Google signed prebuilts for
      # permission and builds from prebuilts by default.
      # Update the permission to an sdk snapshot generated with
      # r.android.com/2151273.
      # Make sure that the permission is built from prebuilts by
      # default
Change-Id: Id4eb9ba0da8a05c41d3b29b1cb8fa1d2d485c7b9
Merged-In: Id4eb9ba0da8a05c41d3b29b1cb8fa1d2d485c7b9
2022-07-13 14:01:31 +00:00
Zhi Dou
0ed7488697 Merge "Keep proguard fields for lite runtime of jarjared class" am: 3f45311ba2
Original change: https://android-review.googlesource.com/c/platform/build/+/2151556

Change-Id: I5cc461978d2c62e5b6114b1bacf344b54e1ff6eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-13 13:28:42 +00:00
Zhi Dou
3f45311ba2 Merge "Keep proguard fields for lite runtime of jarjared class" 2022-07-13 13:09:29 +00:00
zhidou
12fdb34299 Keep proguard fields for lite runtime of jarjared class
Some targets rename protobuf.MessageLite with jarjar rules. This change
adds keep rules to keep the fields of renamed classes.

Bug: 233746531
Test: m checkbuild.
Change-Id: Ib487dbd35f69654489aa28577afb47b9fb87c6f6
Merged-In: I986f05455b45651749fb5f819661041d7399f683
2022-07-13 13:09:09 +00:00