Bill Yi
7978db625f
[automerger skipped] Merge SQ3A.220705.003 to aosp-master - DO NOT MERGE am: f104ed681e
-s ours am: e93e967761
-s ours am: 31b6677cb8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/build/+/2147444
Change-Id: Ie01cad82386ce3605363a277bd39005c79943d3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-08 21:34:25 +00:00
Bill Yi
b54e52a73c
[automerger skipped] Merge "Merge SQ3A.220705.003 to aosp-master - DO NOT MERGE" am: 13b4951c71
-s ours am: c64fc5b26b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/build/+/2147444
Change-Id: Ibbb59b507564f3f0637bba5fe114d946631d7420
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-08 21:08:11 +00:00
Bill Yi
31b6677cb8
[automerger skipped] Merge SQ3A.220705.003 to aosp-master - DO NOT MERGE am: f104ed681e
-s ours am: e93e967761
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/build/+/2147444
Change-Id: I720acc0cdba722895bcb21f1fbefcc3cb46264eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-08 21:07:53 +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
036798e4e3
Merge "Extract fsverity_manifest_generator logic" am: caf7014585
am: 040a786d18
am: 088e07d55d
am: 1cb105d22f
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2144921
Change-Id: Ifc41e212c0fbef2eb60701bf99c6286eddd13a28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-08 07:49:13 +00:00
Andrew Scull
1cb105d22f
Merge "Extract fsverity_manifest_generator logic" am: caf7014585
am: 040a786d18
am: 088e07d55d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2144921
Change-Id: Ice883de9d8c43730bbbe7ee410eb0f2f31bc1a50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-08 07:34:00 +00:00
Andrew Scull
088e07d55d
Merge "Extract fsverity_manifest_generator logic" am: caf7014585
am: 040a786d18
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2144921
Change-Id: Icd0a7102bbd7d82159cf9ba0cee84fe64f5e019a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-08 07:16:12 +00: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
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
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
e0b2fdc04f
Merge "Fix broken test_lunch.py" am: b4f831d56b
am: 046230b625
am: d19278fe06
am: 98207cb465
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2120577
Change-Id: I4084dfa756c40d3bb2d8895647e2ff68a4e4d390
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-01 06:45:04 +00:00
Treehugger Robot
98207cb465
Merge "Fix broken test_lunch.py" am: b4f831d56b
am: 046230b625
am: d19278fe06
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2120577
Change-Id: I4e8a51bc205e63d1b604ba809b71c8c21cd6761d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-01 06:13:13 +00:00
Treehugger Robot
d19278fe06
Merge "Fix broken test_lunch.py" am: b4f831d56b
am: 046230b625
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2120577
Change-Id: I48da371a06f61b44954b90faac6eb69b9b14669b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-01 05:47:05 +00:00
Yi-yo Chiang
78ad4e9164
Merge "Fix init_boot.img build rule with TARGET_NO_KERNEL:=true" am: 380fcee20e
am: 2a87991836
am: d8daea527c
am: b3b14ebebb
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2141540
Change-Id: Ibc804804c1c0fbcb4249723d8c469f95eb470611
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-01 05:21:18 +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
Yi-yo Chiang
b3b14ebebb
Merge "Fix init_boot.img build rule with TARGET_NO_KERNEL:=true" am: 380fcee20e
am: 2a87991836
am: d8daea527c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2141540
Change-Id: I951030cd4c4abd22cab9d08197a8d61a0f415e38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-01 05:05:40 +00:00
Treehugger Robot
b4f831d56b
Merge "Fix broken test_lunch.py"
2022-07-01 04:53:23 +00:00
Yi-yo Chiang
d8daea527c
Merge "Fix init_boot.img build rule with TARGET_NO_KERNEL:=true" am: 380fcee20e
am: 2a87991836
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2141540
Change-Id: I6c1806a2cbdbc2bdd6d31bf48ad8166b087ba489
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-01 04:41:25 +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
Xin Li
10fd04046b
[automerger skipped] Fix BUILD_ID after T merge. am: 480b2a5f6e
-s ours am: b0f5c4cb6c
-s ours am: 73373b27cc
-s ours
...
am skip reason: Merged-In I4e4b6a02fc140a1e38ce533031d7eb0a739396df with SHA-1 05442a9213
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/19127225
Change-Id: Ia8a37035ea913bd88e2e024b1d10e3cb211857aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-30 21:20:11 +00:00
Xin Li
73373b27cc
[automerger skipped] Fix BUILD_ID after T merge. am: 480b2a5f6e
-s ours am: b0f5c4cb6c
-s ours
...
am skip reason: Merged-In I4e4b6a02fc140a1e38ce533031d7eb0a739396df with SHA-1 05442a9213
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/19127225
Change-Id: I08219fdbbb3666fba2013031257298af661da2e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-30 21:04:03 +00:00
Xin Li
b0f5c4cb6c
[automerger skipped] Fix BUILD_ID after T merge. am: 480b2a5f6e
-s ours
...
am skip reason: Merged-In I4e4b6a02fc140a1e38ce533031d7eb0a739396df with SHA-1 05442a9213
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/19127225
Change-Id: I034dcc2863267696183ddf95b077042ec199d203
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-30 20:48:19 +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
Xin Li
3c6c1a5c38
[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 05442a9213
-s ours am: a019e163b5
-s ours am: a32da7bb8b
-s ours
...
am skip reason: Merged-In I1dffeb055a68250f574630d4ef5fedc51bad4a2b with SHA-1 dccd189954
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/19094626
Change-Id: If62c76852c2b5670372de66d56db91c4c64dce8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-30 00:02:11 +00:00
Xin Li
a32da7bb8b
[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 05442a9213
-s ours am: a019e163b5
-s ours
...
am skip reason: Merged-In I1dffeb055a68250f574630d4ef5fedc51bad4a2b with SHA-1 dccd189954
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/19094626
Change-Id: If41ea83a64c935f6583fa37f8a12c46e04a4e54f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-29 22:56:27 +00:00
Xin Li
a019e163b5
[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 05442a9213
-s ours
...
am skip reason: Merged-In I1dffeb055a68250f574630d4ef5fedc51bad4a2b with SHA-1 dccd189954
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/19094626
Change-Id: I508b96b9516701f23a1a43536b39007c6c5790cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-29 22:12:57 +00:00
Bob Badour
f6f4c5b4ef
Merge "Revert "Revert "Revert "Target dist files not dist goals."""" into tm-dev-plus-aosp am: c1a84f9507
am: 07e862bdda
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/19119667
Change-Id: Ice55fe89def6c2236bedb7de97b26a46b7de250a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-29 16:01:32 +00:00
Bob Badour
07e862bdda
Merge "Revert "Revert "Revert "Target dist files not dist goals."""" into tm-dev-plus-aosp am: c1a84f9507
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/19119667
Change-Id: I8e6e71b9cc1b41599e87aeb2fdb1f066dbddc493
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-29 15:39:18 +00:00
Bob Badour
c1a84f9507
Merge "Revert "Revert "Revert "Target dist files not dist goals."""" into tm-dev-plus-aosp
2022-06-29 15:10:01 +00:00
Bob Badour
f819c7dd41
Revert "Revert "Revert "Target dist files not dist goals."""
...
This reverts commit 5a4fe7aa62
.
Bug: 237412270
Reason for revert: b/237412270
Change-Id: I467a0fe71f62babeba2ee0829cb68ba656743c94
Merged-in: I517c087b3452d305e8d82b38d0c36bff4894558c
2022-06-29 15:06:12 +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
1edf984560
Merge "Make it easier to disable EROFS compression." am: 6531b32955
am: cab98f76fe
am: 249be302f1
am: 0b559ba48b
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2137933
Change-Id: I4984ba94d78e519278eba113c6118186a2d2fc3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-28 20:16:30 +00:00
David Anderson
0b559ba48b
Merge "Make it easier to disable EROFS compression." am: 6531b32955
am: cab98f76fe
am: 249be302f1
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2137933
Change-Id: I71835f111ad7d3fff6c54c322de0c84d4e86b6af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-28 20:00:09 +00:00
David Anderson
249be302f1
Merge "Make it easier to disable EROFS compression." am: 6531b32955
am: cab98f76fe
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2137933
Change-Id: If306840207cfd1fe25fa237ef5f8191435bdd9f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-28 19:43:14 +00:00
TreeHugger Robot
109d7a95ea
Merge "Revert "Revert "Target dist files not dist goals.""" into tm-dev-plus-aosp am: 6659e3163c
am: 40f7a1a5e5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/19089883
Change-Id: I76eb535128d06516e63b788a1395b2bf1419accf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-28 18:47:23 +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