Treehugger Robot
b6f2fbe125
Merge "Build the proguard dict zip without PACKAGING intermediates" into main am: bf5f9bf015
am: d894889dc9
am: 0cdabb6101
am: a17260ac43
am: 6c7d60f81a
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2734167
Change-Id: Ia24ed03b53a2c257f900ca60e9fb470b7a186231
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-01 00:53:33 +00:00
Kelvin Zhang
0139035d67
Merge "Resize boot_16k.img properly" into main am: a87ce9086f
am: 857824f7cd
am: 4a17d7b479
am: 7cb7de3b2f
am: 29fc685432
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2733818
Change-Id: Ia35a49bea7b517b7ef4cc1097da9dbd2eb97b904
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-01 00:49:18 +00:00
Romain Jobredeaux
64e3833373
Merge "Expose global proguard flags for use by R8." into main am: 1fb1dd2fb1
am: e13b1092c6
am: de8fe1b2cd
am: ec2de374af
am: bd9763a44d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2733475
Change-Id: I0424b1e53366f59fa20b98593ad7fd001c9a775f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-01 00:45:17 +00:00
Pawan Wagh
904c8194dd
Merge "Adding a system property to enable 16k dev options" into main
2023-09-01 00:26:13 +00:00
Kelvin Zhang
542a27eecf
Add missing depdency for 16k boot image
...
Bug: 298295675
Bug: 293313353
Test: th
Change-Id: I9679c151e77398e161c04487699bc3a0d776ab13
2023-08-31 16:25:12 -07:00
Treehugger Robot
6c7d60f81a
Merge "Build the proguard dict zip without PACKAGING intermediates" into main am: bf5f9bf015
am: d894889dc9
am: 0cdabb6101
am: a17260ac43
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2734167
Change-Id: I166936d69cd46596180e98f1c607ede3fbf0447f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 22:59:28 +00:00
Kelvin Zhang
29fc685432
Merge "Resize boot_16k.img properly" into main am: a87ce9086f
am: 857824f7cd
am: 4a17d7b479
am: 7cb7de3b2f
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2733818
Change-Id: I97151bffc4a4caa4fd3d54cacc8a290b41349d90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 22:58:35 +00:00
Romain Jobredeaux
bd9763a44d
Merge "Expose global proguard flags for use by R8." into main am: 1fb1dd2fb1
am: e13b1092c6
am: de8fe1b2cd
am: ec2de374af
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2733475
Change-Id: I08cb08cba5a612c1821a121bc4f775e7694f3128
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 22:55:35 +00:00
Treehugger Robot
a17260ac43
Merge "Build the proguard dict zip without PACKAGING intermediates" into main am: bf5f9bf015
am: d894889dc9
am: 0cdabb6101
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2734167
Change-Id: I815483b32652d9caeaefa33d42e8f4080dbf785f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 22:21:34 +00:00
Kelvin Zhang
7cb7de3b2f
Merge "Resize boot_16k.img properly" into main am: a87ce9086f
am: 857824f7cd
am: 4a17d7b479
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2733818
Change-Id: I4d6318cc0d0880522ecc455e99ed32b337fbff4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 22:19:53 +00:00
Romain Jobredeaux
ec2de374af
Merge "Expose global proguard flags for use by R8." into main am: 1fb1dd2fb1
am: e13b1092c6
am: de8fe1b2cd
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2733475
Change-Id: Ice0f53bdc0855db20a5d9e45878cbb1ff96bf1b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 22:18:18 +00:00
Treehugger Robot
0cdabb6101
Merge "Build the proguard dict zip without PACKAGING intermediates" into main am: bf5f9bf015
am: d894889dc9
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2734167
Change-Id: Ib6a286f79c116cd16d01fee3499ce6dbe5e3fd4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 21:32:23 +00:00
Kelvin Zhang
4a17d7b479
Merge "Resize boot_16k.img properly" into main am: a87ce9086f
am: 857824f7cd
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2733818
Change-Id: I9990b58b3e08b8279d1151e21ae95abf5c6d8fde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 21:31:25 +00:00
Romain Jobredeaux
de8fe1b2cd
Merge "Expose global proguard flags for use by R8." into main am: 1fb1dd2fb1
am: e13b1092c6
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2733475
Change-Id: Icc05e880bdc420647a4ab841d4dfc7bb714da078
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 21:28:32 +00:00
Treehugger Robot
d894889dc9
Merge "Build the proguard dict zip without PACKAGING intermediates" into main am: bf5f9bf015
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2734167
Change-Id: I17244b1f9de61e1128ded4864fbefd2884e95b4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 20:23:46 +00:00
Kelvin Zhang
857824f7cd
Merge "Resize boot_16k.img properly" into main am: a87ce9086f
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2733818
Change-Id: I789e3839dd6c53c20d9739fd4dc97a97e7027651
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 20:22:25 +00:00
Romain Jobredeaux
e13b1092c6
Merge "Expose global proguard flags for use by R8." into main am: 1fb1dd2fb1
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2733475
Change-Id: I8bbe01de4070b1008e153e57e365867271b890f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 20:20:20 +00:00
Pawan Wagh
8253e12483
Adding a system property to enable 16k dev options
...
16K dev option should be visible on particular devices which set
PRODUCT_16K_DEVELOPER_OPTION. Adding a system property which will be
enabled based on this option.
Test: m, booted device with PRODUCT_16K_DEVELOPER_OPTION ON/OFF and
verified option visibility.
Bug: 297922563
Change-Id: I6d1cd2ce0c6f38fb43222d8e1ac2b797ef675c62
2023-08-31 20:08:31 +00:00
Treehugger Robot
bf5f9bf015
Merge "Build the proguard dict zip without PACKAGING intermediates" into main
2023-08-31 19:37:27 +00:00
Kelvin Zhang
a87ce9086f
Merge "Resize boot_16k.img properly" into main
2023-08-31 19:17:34 +00:00
Kelvin Zhang
8aa6525ad7
Use seek() instead of writing 0s
...
test_ZipWrite_large_file need to write a 4GB file to zipfile for
testing. Instead of writing sequence of 0s to the test file, use seek().
Test: th
Bug: 298138109
Change-Id: I886bfa0c3f21664e529ba7de9688909518148f61
2023-08-31 12:17:14 -07:00
Kelvin Zhang
c4f737406a
Mark boot OTAs as partial OTAs
...
Boot partition only OTA must be marked as "partial". This is required
for update_engine to correctly copy non-updated partitions to the target
slot.
Test: th
Bug: 293313353
Change-Id: Ic89d03f214e12fa43f686d37854d6fed1d78a6a3
2023-08-31 12:17:14 -07:00
Kelvin Zhang
bf2d400799
Resize boot_16k.img properly
...
Bootloaders often assume boot partition to be 64MB in size. Correctly
size boot_16k.img so that bootloader can verify the AVB footers.
Test: th
Bug: 293313353
Change-Id: I322277b10e99a41c9a262ff76e2f29c3ed16fec0
2023-08-31 12:17:14 -07:00
Xin Li
3a846b926f
Merge UP1A.230905.019
...
Merged-In: Ia5208702fc02d0e1ab53d1affc664363fba74a67
Change-Id: I7ba769565b1dbf56d6e00d85c87b7235b14a857a
2023-08-31 12:08:31 -07:00
Romain Jobredeaux
1fb1dd2fb1
Merge "Expose global proguard flags for use by R8." into main
2023-08-31 18:54:49 +00:00
Devin Moore
2f51b4ee92
Merge changes from topic "no_hidl_support" into main am: 01e56d0ae0
am: 22eb386535
am: 7912e703ad
am: ffb7dd99de
am: 82a4be3132
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2650297
Change-Id: I5be20527a416ba7148a9a4596ef650bde8529b22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 18:50:04 +00:00
Devin Moore
48854f1b8d
Remove hwservicemanager and hidl allocator. am: 64c2559577
am: 278aea5ba4
am: 516f2d9cb8
am: 570d5e6a98
am: 67ef54058d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2650296
Change-Id: Ieacf062b55976c179157d48575ea94d77b591ad7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 18:49:56 +00:00
Treehugger Robot
08a39639d9
Merge "Avoid calling MergeUpdateEngineConfig for non-ab target" into main am: c20ef7ca4a
am: 69c8926522
am: c0426045fd
am: a4d5be3239
am: fd0fa2cb82
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2653761
Change-Id: I92cf065106a12dfe2a7191def1e01f761d13c93a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 18:49:30 +00:00
Devin Moore
82a4be3132
Merge changes from topic "no_hidl_support" into main am: 01e56d0ae0
am: 22eb386535
am: 7912e703ad
am: ffb7dd99de
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2650297
Change-Id: I1ab7b3837001450973da9d8ccbb9dee2799e4c79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 17:50:01 +00:00
Devin Moore
67ef54058d
Remove hwservicemanager and hidl allocator. am: 64c2559577
am: 278aea5ba4
am: 516f2d9cb8
am: 570d5e6a98
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2650296
Change-Id: I38e41eb2aad7db9813b24308f11a3ea4cec9c09c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 17:49:57 +00:00
Treehugger Robot
fd0fa2cb82
Merge "Avoid calling MergeUpdateEngineConfig for non-ab target" into main am: c20ef7ca4a
am: 69c8926522
am: c0426045fd
am: a4d5be3239
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2653761
Change-Id: I7ecaace888f0b9ac9b8b1e357a558fc55775f743
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 17:49:32 +00:00
My Name
e30a739758
Bump SDK Extension version to 10
...
This bump includes HealthConnect, Tethering, AppSearch and AdServices
Bug: 298437362
Test: The build passes
Ignore-AOSP-first: Finalization is not performed in AOSP
Change-Id: I3251856e69722cc06da543d5e3535e9d7701eeb8
2023-08-31 17:46:14 +00:00
Devin Moore
ffb7dd99de
Merge changes from topic "no_hidl_support" into main am: 01e56d0ae0
am: 22eb386535
am: 7912e703ad
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2650297
Change-Id: Ifceeed1721a445dbee378e2bceedbd42b9b84585
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 17:12:40 +00:00
Devin Moore
570d5e6a98
Remove hwservicemanager and hidl allocator. am: 64c2559577
am: 278aea5ba4
am: 516f2d9cb8
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2650296
Change-Id: I288afaeca8d742c5820a5e54b8d0c71fcdfa2738
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 17:12:34 +00:00
Treehugger Robot
a4d5be3239
Merge "Avoid calling MergeUpdateEngineConfig for non-ab target" into main am: c20ef7ca4a
am: 69c8926522
am: c0426045fd
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2653761
Change-Id: Iafb57a78290a2c71573ab61c26320e0162b17aae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 17:12:07 +00:00
Devin Moore
7912e703ad
Merge changes from topic "no_hidl_support" into main am: 01e56d0ae0
am: 22eb386535
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2650297
Change-Id: Ieccef169691f280cb5e67ed8d45a75378e0dbaa8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 16:25:14 +00:00
Devin Moore
516f2d9cb8
Remove hwservicemanager and hidl allocator. am: 64c2559577
am: 278aea5ba4
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2650296
Change-Id: I2a62fa5d2bc5286c5022d062f5bedf6ffdece410
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 16:25:08 +00:00
Treehugger Robot
c0426045fd
Merge "Avoid calling MergeUpdateEngineConfig for non-ab target" into main am: c20ef7ca4a
am: 69c8926522
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2653761
Change-Id: I00038697ee197d8ce732f0a3a1bd99ecb661cbad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 16:22:52 +00:00
Devin Moore
22eb386535
Merge changes from topic "no_hidl_support" into main am: 01e56d0ae0
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2650297
Change-Id: I80fee5153e6ae4bdfb666faf2afc45f2e94372bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 16:22:50 +00:00
Devin Moore
278aea5ba4
Remove hwservicemanager and hidl allocator. am: 64c2559577
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2650296
Change-Id: I250e776c31413097c7c5438db36be890bcdd0881
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 16:22:41 +00:00
Devin Moore
01e56d0ae0
Merge changes from topic "no_hidl_support" into main
...
* changes:
Add symlink to hwservicemanager
Remove hwservicemanager and hidl allocator.
2023-08-31 15:51:14 +00:00
Treehugger Robot
69c8926522
Merge "Avoid calling MergeUpdateEngineConfig for non-ab target" into main am: c20ef7ca4a
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2653761
Change-Id: I12468fb66e3c0915cbd92723c9206950b9721393
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 15:31:37 +00:00
Treehugger Robot
c20ef7ca4a
Merge "Avoid calling MergeUpdateEngineConfig for non-ab target" into main
2023-08-31 14:30:17 +00:00
Inseob Kim
c36ff859e9
Remove code about mixed sepolicy build
...
There is no one actively using mixed sepolicy build, and it made
sepolicy codes too complicated. As we are deprecating mixed build,
removing such code for cleanup.
Bug: 298305798
Test: boot cuttlefish
Change-Id: I6efcfd7bde398564f909b41b3e156ac3d98d64d6
2023-08-31 16:52:04 +09:00
Ken Chen
8b1a2844c1
Merge "Revert "Add 16k/4k boot OTAs to /system partition"" into main am: 7a6468edd5
am: 4f6a32d86f
am: 62c7a824a9
am: b0c598838c
am: ac03bfe5c7
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2734334
Change-Id: Ia0672d04e2a839fb1087424b7fb7dff51ad46b3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 06:39:17 +00:00
Ken Chen
ac03bfe5c7
Merge "Revert "Add 16k/4k boot OTAs to /system partition"" into main am: 7a6468edd5
am: 4f6a32d86f
am: 62c7a824a9
am: b0c598838c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2734334
Change-Id: Ia8bbdae7110dec7e1f87208d266c018dd17c2a9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 05:38:46 +00:00
Ken Chen
b0c598838c
Merge "Revert "Add 16k/4k boot OTAs to /system partition"" into main am: 7a6468edd5
am: 4f6a32d86f
am: 62c7a824a9
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2734334
Change-Id: Iadac26809bbd85b08ad2ede160d3bd96539ac79b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 05:01:52 +00:00
Ken Chen
62c7a824a9
Merge "Revert "Add 16k/4k boot OTAs to /system partition"" into main am: 7a6468edd5
am: 4f6a32d86f
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2734334
Change-Id: Ic2bd5bf73c9cc00a294305bb976f5990655d8b02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 04:14:06 +00:00
Kelvin Zhang
d0406b8d01
Merge "Add 16k/4k boot OTAs to /system partition" into main am: ee8b6cf22d
am: 9e02776e5c
am: 1fadfdf0aa
am: 06af034044
am: 1b3f1f8811
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2734615
Change-Id: If76670d3eb2dedfae8a761955f8d6e25e27543e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 03:27:42 +00:00
Ken Chen
4f6a32d86f
Merge "Revert "Add 16k/4k boot OTAs to /system partition"" into main am: 7a6468edd5
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2734334
Change-Id: I27fc3fe1df0c32b433d8d347330acd3cf1551836
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-31 03:22:46 +00:00