Commit graph

76808 commits

Author SHA1 Message Date
Treehugger Robot
f6f6c2f8cf Merge "Fix signapk jar not found for prebuilt splits" 2022-07-29 21:55:58 +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
55d24aeb4c Merge "Ensure runtime-visible annotations are kept" 2022-07-28 15:58:28 +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
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
Treehugger Robot
2c3c189da7 Merge "Remove TARGET_ENABLE_MEDIADRM_64 from BoardConfigGsiCommon.mk" 2022-07-22 14:04:17 +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
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
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
602b19905c Merge "Adding support for building AFLpp Test: Built AFL fuzzers locally and ran them" 2022-07-14 16:26:41 +00:00
SzuWei Lin
aba99adea4 Merge "Support dynamic 64-bit media service" 2022-07-14 00:20:03 +00:00
Elliott Hughes
449986300c Merge "Add support for only starting 64 bit zygote." 2022-07-13 19:57:47 +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
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
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
Cory Barker
91ee4f9e49 Adding support for building AFLpp
Test: Built AFL fuzzers locally and ran them

Change-Id: I1dc2b8e46877327f1b2a881798c74480442f2bcc
2022-07-12 21:32:53 +00:00
Cory Barker
990e6041ea Merge "Revert "Adding support for building AFLpp Test: Built AFL fuzzer..."" 2022-07-12 20:20:00 +00:00
Cory Barker
cadfdc16b9 Revert "Adding support for building AFLpp Test: Built AFL fuzzer..."
Revert "Adding support for building AFLpp Test: Build AFL fuzzer..."

Revert submission 2124256-AFLpp support in Soong

Reason for revert: It is breaking the build
Reverted Changes:
Ie07ec3368:Adding support for building AFLpp Test: Build AFL ...
I5bd6d1e9b:Adding support for building AFLpp Test: Built AFL ...

Change-Id: Iad3fa47397cfe3310f80e109af93d66eb40d9ab4
2022-07-12 18:04:17 +00:00
Cory Barker
66a7233b58 Merge "Adding support for building AFLpp Test: Built AFL fuzzers locally and ran them" 2022-07-12 17:21:05 +00:00
Treehugger Robot
66b010f2cf Merge "make: fix memory leak" 2022-07-11 21:09:58 +00:00
Treehugger Robot
5eacd4a7f1 Merge "Revert "Revert "Target dist files not dist goals.""" 2022-07-11 18:14:39 +00:00
Bill Yi
13b4951c71 Merge "Merge SQ3A.220705.003 to aosp-master - DO NOT MERGE" 2022-07-08 20:14:12 +00:00
Bill Yi
f104ed681e Merge SQ3A.220705.003 to aosp-master - DO NOT MERGE
Merged-In: Id9f1422402e8a9cbbf4fa09dfd1b11c1fba73309
Merged-In: I13e258dfcd47e8e513239b2517c30fff1a74565a
Change-Id: I76592965b1a89f35e458f1386bf818c2ac30b954
2022-07-08 07:18:02 -07:00
Andrew Scull
caf7014585 Merge "Extract fsverity_manifest_generator logic" 2022-07-08 06:34:57 +00:00
Andrew Scull
0a6d2e54dc Extract fsverity_manifest_generator logic
Let the fsverity_manifest_generator logic be reused and just keep the
bits to generate the BuildManifest.apk. Since this can all be acheived
with a series of shell commands, remove the python script and just do it
directly in the Makefile.

Bug: 237384936
Test: TH
Change-Id: I168dc1cea0be72b5098f99e4183e080a687fb03e
2022-07-07 19:56:31 +00:00
Peter Collingbourne
683c493cc7 Allow building super.img on targets without BOARD_BUILD_SUPER_IMAGE_BY_DEFAULT set.
With this change, if BOARD_BUILD_SUPER_IMAGE_BY_DEFAULT is unset, a
target will be declared for super.img so it becomes possible to build it
(e.g. with `m superimage`), but it will not be part of the default `droid`
target. This is useful for building a `super.img` on targets that do
not normally need one without needing to go through a slow `m dist` step.

Change-Id: I599e93b3fc41fc2c0642761fcda757c40e2736d6
2022-07-06 15:57:26 -07:00
Cory Barker
b86b5bed3f Adding support for building AFLpp
Test: Built AFL fuzzers locally and ran them

Change-Id: I5bd6d1e9b19558ce8135b19491160dba14dea04e
2022-07-06 21:17:19 +00:00
SzuWei Lin
951279493d Support dynamic 64-bit media service
64-bit GSI requires support both 64_32-bit and 64-bit devices at
the same time. Add a new variable TARGET_DYNAMIC_64_32_MEDIASERVER
to put mediaserver_dynamic.rc into GSI. Which starts 64-bit
mediaserver if ro.zygote is zygote64. Otherwise, it keeps the
original behavior to start 32-bit meidaserver.

Bug: 236664614
Test: make gsi_arm64-user; Check system/etc/init
Test: make gsi_arm-user; Check systen/etc/init
Test: cts-tradefed; run cts-on-gsi -m CtsViewTestCases
Change-Id: I74699ec5fafadcbe78a7fef6d10aaed752cd5afa
2022-07-06 12:06:46 +08:00
Treehugger Robot
b4f831d56b Merge "Fix broken test_lunch.py" 2022-07-01 04:53:23 +00:00
Yi-yo Chiang
380fcee20e Merge "Fix init_boot.img build rule with TARGET_NO_KERNEL:=true" 2022-07-01 03:39:24 +00:00
Yi-Yo Chiang
8b0776d1ca Fix init_boot.img build rule with TARGET_NO_KERNEL:=true
If TARGET_NO_KERNEL is true (device has prebuilt boot.img), then the
init_boot.img build arguments wouldn't be propagated correctly.
This is because INTERNAL_INIT_BOOT_IMAGE_ARGS is misplaced within a
`ifneq ($(strip $(TARGET_NO_KERNEL)),true)` conditional block.

Fix this by moving INTERNAL_INIT_BOOT_IMAGE_ARGS initialization into the
`ifeq ($(BUILDING_INIT_BOOT_IMAGE),true)` block, which is closer to its
first use.

Bug: 237630862
Test: m initbootimage
Change-Id: I6c0ee2c4b5d0be77a93311eba714e0ed555ffd25
2022-06-30 17:44:33 +08:00
David Anderson
6531b32955 Merge "Make it easier to disable EROFS compression." 2022-06-28 18:28:01 +00:00
George Burgess IV
4645f98185 make: fix memory leak
`info->symlink_target` is a `std::string`. This `strdup` therefore leaks
memory. Just use `std::string::operator=(const char *)` instead.

Bug: 206470603
Test: TreeHugger
Change-Id: I71bcaec583c7d429b4d09522cc5eeb2ced009007
2022-06-28 11:23:21 -07:00
Melisa Carranza Zúñiga
051c9a15af Merge "Add sign_sepolicy_path for a binary to sign sepolicy.apex." 2022-06-28 12:26:50 +00:00
Treehugger Robot
ea00bc65af Merge "Export the host_required property to module-info" 2022-06-28 06:55:38 +00:00
Yike
e4a549195c Export the host_required property to module-info
Some test modules such as `android_test` use the `host_required` attribute to include additional harness dependencies. For example, `CtsLibcoreTestCases` references `cts-dalvik-host-test-runner` in the `host_required` attribute since those jars are required by Tradefed at runtime.

This information needs to present in module_info.json and exported to properly generate Bazel targets that include these runtime dependencies.

Test: m out/target/product/coral/module-info.json
Bug: 220991354
Change-Id: I8d2ab0da04c9f4aff17d290999c69ffe0534729f
2022-06-28 10:10:35 +08:00
Bob Badour
40d38b48ec Revert "Revert "Target dist files not dist goals.""
This reverts commit 9f1fad04ce.

Reason for revert: Fixed latent bug in OTA test

This change creates license texts and lists of projects to share for
individual files in dist instead of for dist goals.

If a distribution needs the license texts for part of a dist file or
for a combination of multiple files, whoever is distributing will have
to create a suitable text notice using `gen_notice{}` or `testnotice`
and include it among the dist files for the goal using `dist-for-goals`
or equivalent.

Bug: 151177513
Bug: 210912771
Bug: 235333302
Bug: 232138105
Bug: 235302632

Test: m cts dist

Test: m droid dist

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

Change-Id: I9fbcb07acfa7b14a140563cb031374160b6b23c2
Merged-in: I9fbcb07acfa7b14a140563cb031374160b6b23c2
2022-06-28 01:17:56 +00:00
David Anderson
f3c81d7e10 Make it easier to disable EROFS compression.
Currently the only way to do this is to enable deduplication.

Bug: N/A
Test: BOARD_EROFS_COMPRESSOR := none
Change-Id: I7f8b99fbcefe7bbc15dfab7062b321aa3e2cf1ca
2022-06-27 23:20:34 +00:00
Vinh Tran
836d78413a Merge "Default BuildBrokenDepfile to empty (false)" 2022-06-27 21:17:27 +00:00
Cole Faust
556a556883 Merge "Deduplicate multiple $(inherit-product) calls" 2022-06-27 17:01:04 +00:00
Vinh Tran
3fae6fe0db Default BuildBrokenDepfile to empty (false)
Test: The builds should still pass because all depfile is cleanup in
AOSP
Bug: 179452413

Change-Id: Ifb6f5320f72c3beb44ddd6654100645e0a62e659
2022-06-27 12:05:11 -04:00
Melisa Carranza Zuniga
e0a977affd Add sign_sepolicy_path for a binary to sign sepolicy.apex.
Bug: b/217570541
Test: sign_apex --container_key=testdata/testkey
--payload_key=testdata/testkey_RSA4096.key
--codename_to_api_level_map=S:31,T:32,UpsideDownCake:33
-e SEPolicy-33.zip=testdata/testkey com.android.sepolicy.apex
signed_sepolicy.apex

Change-Id: Ifdd1c6e7db07cbc4674450ab0e2226494c98605a
2022-06-27 11:03:26 +02:00
Kelvin Zhang
91410f104d Merge "Fix potential issues if str has spaces" 2022-06-25 00:49:48 +00:00