Commit Graph

91451 Commits

Author SHA1 Message Date
Treehugger Robot
770c3c8f68 Merge "Fix 16k ota package build failures on pixel" into main am: 8c3bb5b993 am: d3cfff21f4 am: 46293a1a4e am: 45c77b0369
Original change: https://android-review.googlesource.com/c/platform/build/+/2726994

Change-Id: I015f2f723436b39e8afb2cfac335922cd9690936
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 21:44:58 +00:00
Treehugger Robot
45c77b0369 Merge "Fix 16k ota package build failures on pixel" into main am: 8c3bb5b993 am: d3cfff21f4 am: 46293a1a4e
Original change: https://android-review.googlesource.com/c/platform/build/+/2726994

Change-Id: I3d471d9a3d98c75899a2f42f9b52fee883b3d091
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 21:12:57 +00:00
Treehugger Robot
1483a3e03d Merge "Use platform built lz4 tool rather than system copy" into main am: 510e0f2cbd am: 2a6a71476b am: 8cf849c86c am: cd19122a2b am: 4cf0f72e80
Original change: https://android-review.googlesource.com/c/platform/build/+/2724254

Change-Id: Ic26ff3e0d08c30b3cbb1585a30b07ab14cfa4b40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 21:11:48 +00:00
Kelvin Zhang
f6fe0a9c9c Reduce OTA tools's dependency on brillo_update_payload
brillo_update_payload is thin bash wrapper for delta_generator, and
OTA tools are wrappers around brillo_update_payload. This is
inconveinent, as adding a new flag requires changing 3 places. Since
brillo_update_payload is really thin, skip it and invoke delta_generator
directly.

Test: th
Bug: 293313353
Change-Id: I2fd5af95c571ea45aea62f9eec475f0f4e864953
2023-08-25 13:49:09 -07:00
Treehugger Robot
46293a1a4e Merge "Fix 16k ota package build failures on pixel" into main am: 8c3bb5b993 am: d3cfff21f4
Original change: https://android-review.googlesource.com/c/platform/build/+/2726994

Change-Id: I58dd6c8a804a2a71e8e7bdded6eeee9325484b29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 20:31:23 +00:00
Xin Li
be1435290d Merge Android U (ab/10368041)
Bug: 291102124
Merged-In: If9360ebd0acebe85f42f89a268c316d51c765708
Change-Id: I58470464a3239a2ad8e82e4821bb27a2892a8302
2023-08-25 13:25:26 -07:00
Treehugger Robot
4cf0f72e80 Merge "Use platform built lz4 tool rather than system copy" into main am: 510e0f2cbd am: 2a6a71476b am: 8cf849c86c am: cd19122a2b
Original change: https://android-review.googlesource.com/c/platform/build/+/2724254

Change-Id: I11b709bfcaffbcda403de5eb1b035fd43666d352
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 20:20:39 +00:00
Treehugger Robot
cd19122a2b Merge "Use platform built lz4 tool rather than system copy" into main am: 510e0f2cbd am: 2a6a71476b am: 8cf849c86c
Original change: https://android-review.googlesource.com/c/platform/build/+/2724254

Change-Id: I82a98e37be859e4eadae69b1abbfc96186bfec09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 19:49:03 +00:00
Treehugger Robot
d3cfff21f4 Merge "Fix 16k ota package build failures on pixel" into main am: 8c3bb5b993
Original change: https://android-review.googlesource.com/c/platform/build/+/2726994

Change-Id: I57108c8b3aabfd4be81b4b986db6abd86e160ef3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 19:47:18 +00:00
Chris Poultney
c8cd09181f [automerger skipped] Adds modern wallpaper pickers to AOSP installs am: 7d5ca2253c -s ours am: d8ac1a93d1 -s ours
am skip reason: Merged-In I2658d2e5b4d4500f5a991c049f3ea9d2eb2db1a8 with SHA-1 5541d13e89 is already in history

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

Change-Id: I723871d134be21f2bd19dbc23f88df1d250dff78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 19:09:02 +00:00
Treehugger Robot
8cf849c86c Merge "Use platform built lz4 tool rather than system copy" into main am: 510e0f2cbd am: 2a6a71476b
Original change: https://android-review.googlesource.com/c/platform/build/+/2724254

Change-Id: Ic7d6055191710893d852c2a266e987b336d60a09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 19:07:35 +00:00
Treehugger Robot
8c3bb5b993 Merge "Fix 16k ota package build failures on pixel" into main 2023-08-25 18:50:34 +00:00
Treehugger Robot
2a6a71476b Merge "Use platform built lz4 tool rather than system copy" into main am: 510e0f2cbd
Original change: https://android-review.googlesource.com/c/platform/build/+/2724254

Change-Id: Ifbb87b7a8740f076075ea3aa1b05fab5326015f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 18:22:51 +00:00
Treehugger Robot
510e0f2cbd Merge "Use platform built lz4 tool rather than system copy" into main 2023-08-25 17:48:13 +00:00
Chris Poultney
d8ac1a93d1 [automerger skipped] Adds modern wallpaper pickers to AOSP installs am: 7d5ca2253c -s ours
am skip reason: Merged-In I2658d2e5b4d4500f5a991c049f3ea9d2eb2db1a8 with SHA-1 5541d13e89 is already in history

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

Change-Id: I1d452739dc56f2dc324e190e0158a7557d1164e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 17:46:40 +00:00
Kelvin Zhang
e9f4ce4368 Fix 16k ota package build failures on pixel
boot_ota_16k.zip relies on build_boot_from_kernel_avb_enabled. But that
makefile function is guarded by $(BOARD_PREBUILT_BOOTIMAGE). Pixel
defined BOARD_PREBUILT_BOOTIMAGE, which causes
build_boot_from_kernel_avb_enabled to be undefined, resulting in build
failure.

Test: th
Bug: 293313353
Change-Id: I5b01e9bf7fedd9c508f476bc243d860dc48c5ebb
2023-08-25 10:41:48 -07:00
Zhi Dou
e006f6ed49 Merge "aconfig: add fixed read only flag" into main am: feac202f19 am: 68bf49c7c3 am: 7a77297226 am: 22d47ed58a am: 75ceaf3531
Original change: https://android-review.googlesource.com/c/platform/build/+/2720613

Change-Id: I144cc87ba7cf475a203a500bc5ecfa7cba5f2e9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 17:03:39 +00:00
Zhi Dou
75ceaf3531 Merge "aconfig: add fixed read only flag" into main am: feac202f19 am: 68bf49c7c3 am: 7a77297226 am: 22d47ed58a
Original change: https://android-review.googlesource.com/c/platform/build/+/2720613

Change-Id: I37d65c3965c2a40ae561f71fe8e369c27c992ade
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 16:10:44 +00:00
Zhi Dou
22d47ed58a Merge "aconfig: add fixed read only flag" into main am: feac202f19 am: 68bf49c7c3 am: 7a77297226
Original change: https://android-review.googlesource.com/c/platform/build/+/2720613

Change-Id: Iad29b91f291dbbdc289d38f97b0cacc4f7edad41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 15:39:26 +00:00
Zhi Dou
7a77297226 Merge "aconfig: add fixed read only flag" into main am: feac202f19 am: 68bf49c7c3
Original change: https://android-review.googlesource.com/c/platform/build/+/2720613

Change-Id: Ibd8875ace327b61cc2c87372a1d7de004d888b5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 14:59:04 +00:00
Zhi Dou
68bf49c7c3 Merge "aconfig: add fixed read only flag" into main am: feac202f19
Original change: https://android-review.googlesource.com/c/platform/build/+/2720613

Change-Id: I1acf2c13e2684f5ba2d5b36dba94c8e7c9d46da9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 14:15:31 +00:00
Zhi Dou
feac202f19 Merge "aconfig: add fixed read only flag" into main 2023-08-25 13:37:37 +00:00
Treehugger Robot
ca531ae155 Merge "Skip building compat files if REL" into main am: b531ccf36e am: 695570c064 am: 255f2cb464 am: 16a984bf1d am: 525c6f8265
Original change: https://android-review.googlesource.com/c/platform/build/+/2724973

Change-Id: Ia8412cea6865450f0552b6574eb1d3bdecb86007
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 07:26:16 +00:00
Treehugger Robot
525c6f8265 Merge "Skip building compat files if REL" into main am: b531ccf36e am: 695570c064 am: 255f2cb464 am: 16a984bf1d
Original change: https://android-review.googlesource.com/c/platform/build/+/2724973

Change-Id: Ie16160d3f9c2344775e98bc3f7b697b4d29f3126
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 06:36:39 +00:00
Treehugger Robot
16a984bf1d Merge "Skip building compat files if REL" into main am: b531ccf36e am: 695570c064 am: 255f2cb464
Original change: https://android-review.googlesource.com/c/platform/build/+/2724973

Change-Id: I56d7dfac6f5ad669a97672c43fa4471f437740fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 06:07:43 +00:00
Jooyung Han
0d500c58aa Remove TARGET_FLATTEN_APEX
And inherit updatable_apex.mk by default.

Bug: 278826656
Test: presubmit
Change-Id: I3f93608a8750dcd72edc3f9517c70f3490f1a7cd
2023-08-25 15:06:20 +09:00
Treehugger Robot
255f2cb464 Merge "Skip building compat files if REL" into main am: b531ccf36e am: 695570c064
Original change: https://android-review.googlesource.com/c/platform/build/+/2724973

Change-Id: I1d53e235d59ee0e99dda0b8e49045432969cf8c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 05:30:07 +00:00
Treehugger Robot
fa9227787e Merge "Fixes for python 3.11" into main am: c2e0a06152 am: 5929d7cd3e am: fa5a7af47b am: f43f34d4b7 am: b2f38cb1b7
Original change: https://android-review.googlesource.com/c/platform/build/+/2726795

Change-Id: Ie4e87f9521228981ab2c9fdaa145f1e469c5c83b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 05:27:57 +00:00
Treehugger Robot
695570c064 Merge "Skip building compat files if REL" into main am: b531ccf36e
Original change: https://android-review.googlesource.com/c/platform/build/+/2724973

Change-Id: I60db50f0f2bb3a09db3793447f5c08ce186df784
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 04:45:29 +00:00
Treehugger Robot
b2f38cb1b7 Merge "Fixes for python 3.11" into main am: c2e0a06152 am: 5929d7cd3e am: fa5a7af47b am: f43f34d4b7
Original change: https://android-review.googlesource.com/c/platform/build/+/2726795

Change-Id: Ibfb23bdf6b5afccdad2de4d89929e5a28d5e195d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 04:37:18 +00:00
Treehugger Robot
b531ccf36e Merge "Skip building compat files if REL" into main 2023-08-25 04:29:28 +00:00
Inseob Kim
9b2631d11a Skip building compat files if REL
In release build, we don't need to (and shouldn't) build compat files,
because it doesn't make sense to build compat files for itself.
Currently this didn't happen because REL build only happens on -dev
branches. To support main branch setting REL, filtering out
PLATFORM_SEPOLICY_VERSION from compat versions list.

Bug: 296780580
Test: build with next
Change-Id: Ia5c09a1c9b4209ed82dc66307d57decb4f442477
2023-08-25 04:29:09 +00:00
Treehugger Robot
f43f34d4b7 Merge "Fixes for python 3.11" into main am: c2e0a06152 am: 5929d7cd3e am: fa5a7af47b
Original change: https://android-review.googlesource.com/c/platform/build/+/2726795

Change-Id: Ie0cc931a71da3b5c864a3a85f6e6596aebd5b678
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 04:08:58 +00:00
Treehugger Robot
fa5a7af47b Merge "Fixes for python 3.11" into main am: c2e0a06152 am: 5929d7cd3e
Original change: https://android-review.googlesource.com/c/platform/build/+/2726795

Change-Id: I5a63be526c864a135a25ef8e6079e05cac922055
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 03:28:55 +00:00
Treehugger Robot
5929d7cd3e Merge "Fixes for python 3.11" into main am: c2e0a06152
Original change: https://android-review.googlesource.com/c/platform/build/+/2726795

Change-Id: Ifeff1e7d697daef1cc53a7d508d0e2d6386dcf08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 02:47:58 +00:00
Treehugger Robot
c2e0a06152 Merge "Fixes for python 3.11" into main 2023-08-25 02:14:35 +00:00
Chris Poultney
2553e7f239 Merge "Adds modern wallpaper pickers to AOSP installs" into udc-qpr-dev-plus-aosp am: febe181b6f
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24538241

Change-Id: I8928276c1bfd36f053377e727ccaf6fcf9931982
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 02:11:13 +00:00
Kalesh Singh
799325eaf9 Merge changes I890db067,I4150dbd4 into main am: 78ecdf05c4 am: 92865059e2 am: e4ea5ffb6c am: 532c92e5e0 am: 121388ee51
Original change: https://android-review.googlesource.com/c/platform/build/+/2716397

Change-Id: I30b5a8a90315700a70d8f75e69b78a2e7806b2bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 02:10:42 +00:00
Treehugger Robot
ee7d7e1371 Merge "Fix 16K page size kernel config check" into main am: f340bd9c13 am: c7c9a58f1a am: 2760e3dd45 am: 2f2d9d2a64 am: 06339a40a8
Original change: https://android-review.googlesource.com/c/platform/build/+/2725779

Change-Id: I64373c7772bf8b3146624b9d22b34a81d775a924
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 02:10:20 +00:00
Treehugger Robot
f6ef256a6e Merge "Add a 16K boot partition OTA target" into main am: f5fa306ea4 am: efe267a36e am: 97d2062eae am: 15f0aa3026 am: 6af5d51fd0
Original change: https://android-review.googlesource.com/c/platform/build/+/2724253

Change-Id: I8a251ba6cb44e8eab4d0eda16920fec9ddd0711d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 02:09:04 +00:00
Chris Poultney
febe181b6f Merge "Adds modern wallpaper pickers to AOSP installs" into udc-qpr-dev-plus-aosp 2023-08-25 01:34:51 +00:00
Kalesh Singh
121388ee51 Merge changes I890db067,I4150dbd4 into main am: 78ecdf05c4 am: 92865059e2 am: e4ea5ffb6c am: 532c92e5e0
Original change: https://android-review.googlesource.com/c/platform/build/+/2716397

Change-Id: I7659621062ef49f8e3f284b309ddfa75a65db03c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 01:22:02 +00:00
Treehugger Robot
06339a40a8 Merge "Fix 16K page size kernel config check" into main am: f340bd9c13 am: c7c9a58f1a am: 2760e3dd45 am: 2f2d9d2a64
Original change: https://android-review.googlesource.com/c/platform/build/+/2725779

Change-Id: I7eded8cb3f0ea796d686d84f19dc0777f3c4f23b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 01:21:31 +00:00
Treehugger Robot
6af5d51fd0 Merge "Add a 16K boot partition OTA target" into main am: f5fa306ea4 am: efe267a36e am: 97d2062eae am: 15f0aa3026
Original change: https://android-review.googlesource.com/c/platform/build/+/2724253

Change-Id: I228132d269c5378a588110e0efff5ec18a7e09e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 01:21:03 +00:00
Kelvin Zhang
19c36a5ee7 Use platform built lz4 tool rather than system copy
Test: th
Bug: 293313353
Change-Id: I22d5b6906dfd30f947eaa06d6196cdf560c50722
2023-08-24 18:10:24 -07:00
Kalesh Singh
532c92e5e0 Merge changes I890db067,I4150dbd4 into main am: 78ecdf05c4 am: 92865059e2 am: e4ea5ffb6c
Original change: https://android-review.googlesource.com/c/platform/build/+/2716397

Change-Id: I89e2a11b6f09f0450bd75a5ac6bf2b339ea6c513
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 00:50:25 +00:00
Treehugger Robot
2f2d9d2a64 Merge "Fix 16K page size kernel config check" into main am: f340bd9c13 am: c7c9a58f1a am: 2760e3dd45
Original change: https://android-review.googlesource.com/c/platform/build/+/2725779

Change-Id: Ia217e88d7b5559ce93614bf50bd9854e50257617
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 00:50:00 +00:00
Treehugger Robot
15f0aa3026 Merge "Add a 16K boot partition OTA target" into main am: f5fa306ea4 am: efe267a36e am: 97d2062eae
Original change: https://android-review.googlesource.com/c/platform/build/+/2724253

Change-Id: I1447e37f36b6417a81c1af68d752beeb8de60b54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 00:48:58 +00:00
Cole Faust
1f89cbb484 Fixes for python 3.11
Bazel previously had a bug where the source directory of the entrypoint
python script would be added to the path. They added PYTHONSAFEPATH
to the enviornment to fix it, which was introduced in python 3.11.

Now that python is being updated to 3.11, the fix is in, which breaks
some scripts that don't properly specify import folders.

Add the import folders where required.

Bug: 278602456
Test: ./build/bazel/ci/bp2build.sh
Change-Id: I5b87f83247dfdfcb8bdb4f962466cbf522cc29c6
2023-08-24 17:44:01 -07:00
Kalesh Singh
e4ea5ffb6c Merge changes I890db067,I4150dbd4 into main am: 78ecdf05c4 am: 92865059e2
Original change: https://android-review.googlesource.com/c/platform/build/+/2716397

Change-Id: I02de31e0113e7356c1ae422a9d9b37459aba0d7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 00:10:45 +00:00