TreeHugger Robot
52572f1029
[automerger skipped] Merge "Move the stable code from version_defaults.mk to version_util.mk." into sc-v2-dev-plus-aosp am: ac92a01f49
-s ours
...
am skip reason: Merged-In I4798fb69c639e6d52d275a5b793fa0c8ba876202 with SHA-1 0447622dc3
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15822027
Change-Id: I33e95dc8a111484021eab74f96514844d1f8abda
2021-09-14 11:18:31 +00:00
TreeHugger Robot
ac92a01f49
Merge "Move the stable code from version_defaults.mk to version_util.mk." into sc-v2-dev-plus-aosp
2021-09-14 11:09:20 +00:00
Treehugger Robot
523e82936f
Merge "Skip building boot-(test-harness|debug).img if not needed" am: a83a19d41e
am: 523cf4e812
am: 5eb5d66091
am: 983f6c0714
am: c4f58b49e2
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1823019
Change-Id: I76d32956d02d17676be1f57e3a29afbe3792b55e
2021-09-14 11:05:42 +00:00
Treehugger Robot
c4f58b49e2
Merge "Skip building boot-(test-harness|debug).img if not needed" am: a83a19d41e
am: 523cf4e812
am: 5eb5d66091
am: 983f6c0714
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1823019
Change-Id: Idc0395fc344631aebb3e9176971e6ac39a437db4
2021-09-14 10:49:16 +00:00
Treehugger Robot
983f6c0714
Merge "Skip building boot-(test-harness|debug).img if not needed" am: a83a19d41e
am: 523cf4e812
am: 5eb5d66091
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1823019
Change-Id: I46dec9faf57d3fe21cb90e37148c496e49afb8d5
2021-09-14 10:36:33 +00:00
Treehugger Robot
5eb5d66091
Merge "Skip building boot-(test-harness|debug).img if not needed" am: a83a19d41e
am: 523cf4e812
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1823019
Change-Id: I0c6c64f660872576c7b6de69e57866eaec519aa5
2021-09-14 10:26:17 +00:00
Yuntao Xu
f777afcf3b
Merge "Add android-cts-verifier.zip" into sc-dev-plus-aosp am: 27f759c07e
am: e6f76b30c5
am: ae96cd8296
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15786299
Change-Id: Ia4d034001788f0f19806da7d62f40d639926aa0b
2021-09-14 09:55:57 +00:00
Treehugger Robot
523cf4e812
Merge "Skip building boot-(test-harness|debug).img if not needed" am: a83a19d41e
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1823019
Change-Id: I5f65a446198f3d5e6e5218df88473179a73b5f90
2021-09-14 09:43:51 +00:00
Treehugger Robot
a83a19d41e
Merge "Skip building boot-(test-harness|debug).img if not needed"
2021-09-14 09:09:56 +00:00
Yuntao Xu
89c09d9ab9
Add the cts-platform-version check
...
Added the cts-platform-version check when the cts directory exists.
Bug: 194402596
Test: manually modified the ifeq condition to check error message
Test: TreeHugger
Change-Id: I613ac5b5014dbf4e6202e1dbd1b6a92359817cf2
Merged-In: I613ac5b5014dbf4e6202e1dbd1b6a92359817cf2
2021-09-14 05:17:45 +00:00
Yuntao Xu
ae96cd8296
Merge "Add android-cts-verifier.zip" into sc-dev-plus-aosp am: 27f759c07e
am: e6f76b30c5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15786299
Change-Id: I8252762b4fa0d3cee31c599e7098b0169596b77c
2021-09-14 05:13:27 +00:00
Yuntao Xu
e6f76b30c5
Merge "Add android-cts-verifier.zip" into sc-dev-plus-aosp am: 27f759c07e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15786299
Change-Id: I312a43517e6bdbd7f674ab5b9ad134ceb86829b9
2021-09-14 04:54:04 +00:00
Yuntao Xu
27f759c07e
Merge "Add android-cts-verifier.zip" into sc-dev-plus-aosp
2021-09-14 04:36:28 +00:00
Howard Chen
cb6ea4a2a7
Clean up gki-5.4 related rules in GSI
...
There will be no android13-5.4. This CL is to clean up build rules
that refers to the gki-5.4.
Bug: 199807830
Test: lunch aosp_arm64-userdebug
Change-Id: Ia982eb2ee3d1eb64db72c1836e433bcc53e71e3f
2021-09-14 03:38:06 +00:00
Fabien Sanglard
1011d45f5b
Zipalign: Remove unused variables
...
Remove unused variable resulting in compilation warnings.
Remove unused temporary variable.
Bug: NA
Test: zipalign_tests
Change-Id: Ic2236b5878074f0c2537ab0b9f94dfd9c42225d8
2021-09-13 16:52:22 -07:00
Presubmit Automerger Backend
9c9fc1e4b6
[automerged blank] Revert "Revert "RESTRICT AUTOMERGE Set BUILD_ID=SC"" 2p: ef1bcc1f9a
2p: 2fc40f70af
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15798253
Bug: 196178071
Change-Id: Ifd5226cc11166f686ab2e87a060c4526b58211b8
2021-09-13 23:45:07 +00:00
Presubmit Automerger Backend
2fc40f70af
[automerge] Revert "Revert "RESTRICT AUTOMERGE Set BUILD_ID=SC"" 2p: ef1bcc1f9a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15798253
Bug: 196178071
Change-Id: I78ad7c9c835ec51dffe54baeb3f896324cfa42eb
2021-09-13 23:45:04 +00:00
Presubmit Automerger Backend
6fd648e189
[automerge] Revert "Revert "RESTRICT AUTOMERGE Set BUILD_ID=SC"" 2p: ef1bcc1f9a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15798253
Bug: 196178071
Change-Id: Ia03cf697f157a36ad6d0d438d5f901376924e750
2021-09-13 23:45:03 +00:00
Presubmit Automerger Backend
dae95afb04
[automerged blank] Revert "Revert "RESTRICT AUTOMERGE Set BUILD_ID=SC"" 2p: ef1bcc1f9a
...
Blank merge reason: Change-Id I3b7166d28df6d8828f895f839186de78592d259e with SHA-1 644348a687
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15798253
Bug: 196178071
Change-Id: Iae52080211103498662a825f200f832297168ea0
2021-09-13 23:45:03 +00:00
Colin Cross
ef1bcc1f9a
Revert "Revert "RESTRICT AUTOMERGE Set BUILD_ID=SC""
...
This reverts commit bf70d0ba2a
.
Reason for revert: camera prebuilt fixed to support short BUILD_ID
Bug: 196178071
Change-Id: Idcb57daf31907f1dff615e180790a2f52462b430
Merged-In: I3b7166d28df6d8828f895f839186de78592d259e
2021-09-13 23:44:53 +00:00
Sasha Smundak
9a9da6024c
Move the stable code from version_defaults.mk to version_util.mk.
...
With version_defaults.mk containing only simple assignments, it can be
automatically converted to Starlark.
This is a cherrypick of ag/15768054
Bug: 198995713
Test: treehugger
Change-Id: I4798fb69c639e6d52d275a5b793fa0c8ba876202
Merged-In: I4798fb69c639e6d52d275a5b793fa0c8ba876202
2021-09-13 15:50:20 -07:00
Christopher Ferris
6a54633796
Make the script python3.
...
Test: Ran the python version of the script and the python3 version
Test: and verified the output is the same. This is for all three
Test: outputs (html, text, xml).
Test: Builds without an error.
Change-Id: I5138b0a1efbbc3ab764c644afc1783c79fd7e250
2021-09-13 14:54:58 -07:00
Daniel Norman
3e62563e9a
Merge "Rebuild vendor images in sign_target_files_apks with vendor otatools." am: 97e0c2831d
am: 76e3a8419c
am: 38345348a8
am: 5efd7e63bb
am: 6e9b522952
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1782407
Change-Id: I2d9379b33aa411baa14d1c65e92a327a926b73e2
2021-09-13 21:36:40 +00:00
Daniel Norman
6e9b522952
Merge "Rebuild vendor images in sign_target_files_apks with vendor otatools." am: 97e0c2831d
am: 76e3a8419c
am: 38345348a8
am: 5efd7e63bb
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1782407
Change-Id: I54517406cf05993f0ff7f3a1e98d9f48652e60eb
2021-09-13 21:21:06 +00:00
Daniel Norman
5efd7e63bb
Merge "Rebuild vendor images in sign_target_files_apks with vendor otatools." am: 97e0c2831d
am: 76e3a8419c
am: 38345348a8
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1782407
Change-Id: I2dbdec99abb3a14e654e131c0b1d1c5ba6f8a40b
2021-09-13 21:03:34 +00:00
Daniel Norman
38345348a8
Merge "Rebuild vendor images in sign_target_files_apks with vendor otatools." am: 97e0c2831d
am: 76e3a8419c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1782407
Change-Id: I36c911298fbc1fa8e38accb3b0ee2d86b4fefda4
2021-09-13 20:48:45 +00:00
Daniel Norman
76e3a8419c
Merge "Rebuild vendor images in sign_target_files_apks with vendor otatools." am: 97e0c2831d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1782407
Change-Id: I43f9b2dca35442b8afef80fa84e36db811364453
2021-09-13 20:33:30 +00:00
Daniel Norman
97e0c2831d
Merge "Rebuild vendor images in sign_target_files_apks with vendor otatools."
2021-09-13 20:12:11 +00:00
Sasha Smundak
1335903d4e
Move the stable code from version_defaults.mk to version_util.mk.
...
With version_defaults.mk containing only simple assignments, it can be
automatically converted to Starlark.
This is a cherrypick of ag/15768054
Bug: 198995713
Test: treehugger
Merged-In: I4798fb69c639e6d52d275a5b793fa0c8ba876202
Change-Id: I17fab2e46c085fc4c07ae13c5e8cfb439097c634
2021-09-13 09:23:40 -07:00
Rob Seymour
be609fb144
Add fake host snapshot support
...
Map HOST_FAKE_SNAPSHOT_ENABLE to HostFakeSnapshotEnabled() method.
Bug: 194799048
Test: m HOST_FAKE_SNAPSHOT_ENABLE=true host-fake-snapshot dist -- check snapshot exists in dist
Change-Id: Idd343c3dec3cc24514a5d587b06c3b1300598b7d
2021-09-13 15:59:05 +00:00
Huang Jianan
6552727e03
Avoid too much reserved_size for erofs image
...
After the erofs image is built, it won't be modified again. The reserve
room is only used for the hash footer. There is no need to set an
excessive margin.
Bug: 199248596
Test: erofs image size is smaller than before
Signed-off-by: Huang Jianan <huangjianan@oppo.com >
Change-Id: If2535b9ad2c2d60bea74feeca576a168387ff341
2021-09-13 02:03:13 +00:00
Yifan Hong
89041c1216
Merge "Avoid repeated building of erofs image" am: 1ab1c2ff96
am: b74a004520
am: 6edb95a4bd
am: ce1337f075
am: 27db2d4e1f
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1821096
Change-Id: I1bca3ebf001a43422864f801abeaab4148f6b434
2021-09-11 01:28:11 +00:00
Yifan Hong
27db2d4e1f
Merge "Avoid repeated building of erofs image" am: 1ab1c2ff96
am: b74a004520
am: 6edb95a4bd
am: ce1337f075
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1821096
Change-Id: I17b2e76f207dc4ad0c17540e92cec8064963426f
2021-09-11 01:12:27 +00:00
Yifan Hong
ce1337f075
Merge "Avoid repeated building of erofs image" am: 1ab1c2ff96
am: b74a004520
am: 6edb95a4bd
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1821096
Change-Id: I662e5c36b170462e2755a1c9224c4ef8491ed04c
2021-09-11 00:50:36 +00:00
Yifan Hong
6edb95a4bd
Merge "Avoid repeated building of erofs image" am: 1ab1c2ff96
am: b74a004520
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1821096
Change-Id: I90198047d639debe9332828c2fc098f291e9e45d
2021-09-11 00:33:44 +00:00
Yifan Hong
b74a004520
Merge "Avoid repeated building of erofs image" am: 1ab1c2ff96
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1821096
Change-Id: Ibe47f2192262300122e8d6b767a2879af3d317ed
2021-09-11 00:19:15 +00:00
Yifan Hong
1ab1c2ff96
Merge "Avoid repeated building of erofs image"
2021-09-11 00:05:45 +00:00
TreeHugger Robot
523407f529
Merge "Move the stable code from version_defaults.mk to version_util.mk."
2021-09-10 20:00:39 +00:00
Bob Badour
09c1b0dd6a
Merge "Re-call BUILD_NOTICE_FILE for modules that add deps" am: 08472a6b4b
am: 98fd5d25d7
am: 0adcb0c7f6
am: 8613935bad
am: 30655c90d3
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1817318
Change-Id: Iece08a02baadbd806e070316d40d38edfe97c750
2021-09-10 18:41:43 +00:00
Bob Badour
30655c90d3
Merge "Re-call BUILD_NOTICE_FILE for modules that add deps" am: 08472a6b4b
am: 98fd5d25d7
am: 0adcb0c7f6
am: 8613935bad
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1817318
Change-Id: I84fbe0faec1638de3825a6cfbb558e2c46f73c7f
2021-09-10 18:11:36 +00:00
Bob Badour
8613935bad
Merge "Re-call BUILD_NOTICE_FILE for modules that add deps" am: 08472a6b4b
am: 98fd5d25d7
am: 0adcb0c7f6
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1817318
Change-Id: I40c534e102b887323c8df82198465189ae94dec7
2021-09-10 17:56:50 +00:00
Bob Badour
0adcb0c7f6
Merge "Re-call BUILD_NOTICE_FILE for modules that add deps" am: 08472a6b4b
am: 98fd5d25d7
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1817318
Change-Id: I058553fbd3ccb184b562c0fca9d512a4e666bcd6
2021-09-10 17:38:40 +00:00
Bob Badour
98fd5d25d7
Merge "Re-call BUILD_NOTICE_FILE for modules that add deps" am: 08472a6b4b
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1817318
Change-Id: I0b3e806c6ef03de8e8fa5ae4120d3194f9f8b1f9
2021-09-10 17:22:16 +00:00
Bob Badour
08472a6b4b
Merge "Re-call BUILD_NOTICE_FILE for modules that add deps"
2021-09-10 16:59:06 +00:00
Yi Kong
0d25c14153
Merge "Fix arguments passed to llvm-readobj" am: c48a9fb19c
am: 5353d0f3b9
am: bc7eeebaa3
am: 5c06fafbd6
am: 155138661c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1823794
Change-Id: I5dbdb5b452662ff016083561b54517a16b484824
2021-09-10 16:49:01 +00:00
Yi Kong
155138661c
Merge "Fix arguments passed to llvm-readobj" am: c48a9fb19c
am: 5353d0f3b9
am: bc7eeebaa3
am: 5c06fafbd6
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1823794
Change-Id: I449cd5528df57ef1bccecda2b16b30fd69c84235
2021-09-10 16:30:59 +00:00
Yi Kong
5c06fafbd6
Merge "Fix arguments passed to llvm-readobj" am: c48a9fb19c
am: 5353d0f3b9
am: bc7eeebaa3
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1823794
Change-Id: Ic4d4de43d3296bc631d90a37c1d6458bea197ac7
2021-09-10 16:12:56 +00:00
Yi Kong
bc7eeebaa3
Merge "Fix arguments passed to llvm-readobj" am: c48a9fb19c
am: 5353d0f3b9
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1823794
Change-Id: If8aaa49e5dc408bab83f2f2470a9df0e81dc2981
2021-09-10 15:58:09 +00:00
Yi Kong
5353d0f3b9
Merge "Fix arguments passed to llvm-readobj" am: c48a9fb19c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1823794
Change-Id: I93dcd361b4139b02679d077a70b078bc08713e8a
2021-09-10 15:28:13 +00:00
Yi Kong
c48a9fb19c
Merge "Fix arguments passed to llvm-readobj"
2021-09-10 15:15:08 +00:00