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
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