Commit graph

80337 commits

Author SHA1 Message Date
Android Build Coastguard Worker
de072d3d49 Version bump to TP1A.220624.015 [core/build_id.mk]
Change-Id: I25acaf686414ac908673e518e6037ca6ef9c2cc9
2022-07-13 01:45:52 +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
4ab0d5531d Merge "Revert "Adding support for building AFLpp Test: Built AFL fuzzer..."" am: 990e6041ea
Original change: https://android-review.googlesource.com/c/platform/build/+/2151854

Change-Id: I2957590fbb01793f9c7de679f9ab9b43863fc921
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-12 20:40:44 +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
6c54a1a369 Merge "Adding support for building AFLpp Test: Built AFL fuzzers locally and ran them" am: 66a7233b58
Original change: https://android-review.googlesource.com/c/platform/build/+/2124220

Change-Id: I29273d21519c046eb74a20eb33c48f6bf4b93b84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-12 17:39:55 +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
Xin Li
294a1ab042 DO NOT MERGE - Skip TP1A.220624.013
Change-Id: I4488ab06208dd0b75edf98be138a65a5e0d9a63b
2022-07-11 21:55:40 -07:00
Android Build Coastguard Worker
2879d3117d Version bump to TP1A.220624.014 [core/build_id.mk]
Change-Id: Idbff6d854ddb9df5b5936a45a822d63a7445deee
2022-07-12 01:05:16 +00:00
Treehugger Robot
8493849334 Merge "make: fix memory leak" am: 66b010f2cf
Original change: https://android-review.googlesource.com/c/platform/build/+/2138495

Change-Id: Ica6a38075b8cc2320c9aa71a48c7c2b65af0e368
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-11 21:52:21 +00:00
Treehugger Robot
66b010f2cf Merge "make: fix memory leak" 2022-07-11 21:09:58 +00:00
Treehugger Robot
bfdcb63358 Merge "Revert "Revert "Target dist files not dist goals.""" am: 5eacd4a7f1
Original change: https://android-review.googlesource.com/c/platform/build/+/2132647

Change-Id: I6330f9f094e7f21491f0bceb45bad018e8d64b1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-11 19:27:54 +00:00
Treehugger Robot
5eacd4a7f1 Merge "Revert "Revert "Target dist files not dist goals.""" 2022-07-11 18:14:39 +00:00
Android Build Coastguard Worker
ea74f3753f Version bump to TP1A.220624.013 [core/build_id.mk]
Change-Id: Ie16b441e03a031121fa6e3b1621a2c76ba8f4bb7
2022-07-09 21:53:22 +00:00
Android Build Coastguard Worker
d08025e143 Version bump to TP1A.220624.012 [core/build_id.mk]
Change-Id: Idfcc0649c498111bba9259ce76fafb9acfca585c
2022-07-09 07:37:45 +00:00
Bill Yi
c64fc5b26b [automerger skipped] Merge "Merge SQ3A.220705.003 to aosp-master - DO NOT MERGE" am: 13b4951c71 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibb39e4ee4dbc38e37d61d590b6653ff36582fd97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-08 20:34:23 +00:00
Bill Yi
e93e967761 [automerger skipped] Merge SQ3A.220705.003 to aosp-master - DO NOT MERGE am: f104ed681e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic661725cdb6cabbfea47824c85f30082fbe0aae7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-08 20:34:06 +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
040a786d18 Merge "Extract fsverity_manifest_generator logic" am: caf7014585
Original change: https://android-review.googlesource.com/c/platform/build/+/2144921

Change-Id: I01e0848590cdd3ab84e19bdb28fc331b1ea1a051
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-08 06:56:36 +00:00
Andrew Scull
caf7014585 Merge "Extract fsverity_manifest_generator logic" 2022-07-08 06:34:57 +00:00
Android Build Coastguard Worker
9d9caf2ee9 Version bump to TP1A.220624.011 [core/build_id.mk]
Change-Id: Ia2c1a3adbb96711c5f6c15f7b5bcd305ec336073
2022-07-08 00:19:59 +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
Android Build Coastguard Worker
c494d0291a Version bump to TP1A.220624.010 [core/build_id.mk]
Change-Id: Ied294fcb0a4d7a2cbc6c6ae26370057c41b11b5f
2022-07-07 03:06:19 +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
Android Build Coastguard Worker
193d68bbc3 Version bump to TP1A.220624.009 [core/build_id.mk]
Change-Id: I5704765db36bf7eee269ceb59ccbf808fd08f79d
2022-07-01 23:47:44 +00:00
Treehugger Robot
046230b625 Merge "Fix broken test_lunch.py" am: b4f831d56b
Original change: https://android-review.googlesource.com/c/platform/build/+/2120577

Change-Id: Id9f1422402e8a9cbbf4fa09dfd1b11c1fba73309
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 05:12:32 +00:00
Treehugger Robot
b4f831d56b Merge "Fix broken test_lunch.py" 2022-07-01 04:53:23 +00:00
Yi-yo Chiang
2a87991836 Merge "Fix init_boot.img build rule with TARGET_NO_KERNEL:=true" am: 380fcee20e
Original change: https://android-review.googlesource.com/c/platform/build/+/2141540

Change-Id: I271ed2d7d4c12e9da99eb9ed29df426eaedc0351
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 04:05:55 +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
Android Build Coastguard Worker
a8de116ced Version bump to TP1A.220624.008 [core/build_id.mk]
Change-Id: I38c1fb3d98250396831c445fcc7666cfeaaa2c49
2022-07-01 00:59:58 +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
Xin Li
480b2a5f6e Fix BUILD_ID after T merge.
Bug: 236760014
Merged-In: I4e4b6a02fc140a1e38ce533031d7eb0a739396df
Change-Id: I98773bd8a62e2a7160e70d0c888c799f2f10fbf0
2022-06-30 05:56:26 +00:00
Android Build Coastguard Worker
af0a439b77 Version bump to TP1A.220624.007 [core/build_id.mk]
Change-Id: If63d2ac0b3f19b6f20852c19aa7ce56a23dbe512
2022-06-30 02:28:16 +00:00
Android Build Coastguard Worker
9b2f585765 Version bump to TP1A.220624.006 [core/build_id.mk]
Change-Id: I44654bde98093cf52112518f947c447b414c69ea
2022-06-29 04:13:10 +00:00
Android Build Coastguard Worker
28ab2d31e7 Version bump to TP1A.220624.005 [core/build_id.mk]
Change-Id: Idec156499d8e9c158f62c0e323d6c1a1071b1c22
2022-06-29 00:04:47 +00:00
Xin Li
05442a9213 Merge tm-dev-plus-aosp-without-vendor@8763363
Bug: 236760014
Merged-In: I1dffeb055a68250f574630d4ef5fedc51bad4a2b
Change-Id: I4e4b6a02fc140a1e38ce533031d7eb0a739396df
2022-06-28 21:23:05 +00:00
David Anderson
cab98f76fe Merge "Make it easier to disable EROFS compression." am: 6531b32955
Original change: https://android-review.googlesource.com/c/platform/build/+/2137933

Change-Id: I8152bc94485259f39783d515fe7f91c54e48e6d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-28 18:46:29 +00: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
3945b1d91a Merge "Add sign_sepolicy_path for a binary to sign sepolicy.apex." am: 051c9a15af
Original change: https://android-review.googlesource.com/c/platform/build/+/2129475

Change-Id: I8030bbe9afbfed13412e18ef98cab34ae60f2a5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-28 12:59:29 +00: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
bd1224f7e4 Merge "Export the host_required property to module-info" am: ea00bc65af
Original change: https://android-review.googlesource.com/c/platform/build/+/2133266

Change-Id: Ieda8f3fc36576fddafe8c47d9407199a1cd7ddad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-28 07:28:05 +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
Android Build Coastguard Worker
3aaf633e7e Version bump to TP1A.220624.004 [core/build_id.mk]
Change-Id: I5279757e5c0c64f5e9c72c3b8b1bcbb3b10787b7
2022-06-28 01:30:27 +00: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