Commit graph

89793 commits

Author SHA1 Message Date
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
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
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
Treehugger Robot
2760e3dd45 Merge "Fix 16K page size kernel config check" into main am: f340bd9c13 am: c7c9a58f1a
Original change: https://android-review.googlesource.com/c/platform/build/+/2725779

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

Change-Id: I335a429714055bf0e3e780ef032f321d476ad442
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25 00:09:28 +00:00
Kalesh Singh
92865059e2 Merge changes I890db067,I4150dbd4 into main am: 78ecdf05c4
Original change: https://android-review.googlesource.com/c/platform/build/+/2716397

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

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

Change-Id: I52a1c19da7b8a5a99c8ae1709c41e6688befb118
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24 23:27:15 +00:00
Kalesh Singh
78ecdf05c4 Merge changes I890db067,I4150dbd4 into main
* changes:
  zipalign: Allow specifiying the target page size
  zipalign: Fix pageAlignSharedLibs arg in tests
2023-08-24 22:59:42 +00:00
Treehugger Robot
f340bd9c13 Merge "Fix 16K page size kernel config check" into main 2023-08-24 22:58:56 +00:00
Treehugger Robot
f5fa306ea4 Merge "Add a 16K boot partition OTA target" into main 2023-08-24 22:38:23 +00:00
Kalesh Singh
55405b61be zipalign: Allow specifiying the target page size
Allow apps to specify the target page size for aligning their
uncompressed shared libraries.

This allows apps that want to support larger page sizes to do
so by specifiying the -P <pagesize_kb> flag.

However, apps built for 4k-only devices are unaffected as they
can continue to use -p flag for 4kB page alignment of uncompressed
shared libraries.

Bug: 276963821
Test: atest -c zipalign_tests
Change-Id: I890db067b8f898045f73e86788662f94a48af772
Signed-off-by: Kalesh Singh <kaleshsingh@google.com>
2023-08-24 14:46:13 -07:00
Kelvin Zhang
9113badc39 Fix 16K page size kernel config check
Non 16K kernels might have "CONFIG_ARM64_16K_PAGES is not set" string in
kernel config, properly handle this case.

Test: th
Bug: 293313353
Change-Id: I1a9582503c5fd20b8dcf95406166df7e11940424
2023-08-24 14:26:23 -07:00
Kelvin Zhang
6257eb2144 Add a 16K boot partition OTA target
This OTA will be used to switch real devices to 16K kernel

Test: th
Bug: 293313353
Change-Id: I7a5866fd6f7f4ba6646af019386085ea2646c93f
2023-08-24 13:44:59 -07:00
Chris Poultney
5541d13e89 Adds modern wallpaper pickers to AOSP installs
Bug: b/294871815
Change-Id: I2658d2e5b4d4500f5a991c049f3ea9d2eb2db1a8
Test: built and flashed aosp device and launched ThemePicker
Test: ran all CTS tests per b/294871815#comment11 on aosp device with ThemePicker
Ignore-AOSP-First: Change only applies to udc-qpr-dev and forward and will cause breakages in tm-dev and udc-dev.
2023-08-24 15:19:31 +00:00
Vincent Donnefort
01def4629e Merge "Revert "Adds modern wallpaper pickers to AOSP installs"" into main am: 07c4b5c0f2 am: 3e8443e18e am: ad81fc0d1d am: f1f3c8ab80
Original change: https://android-review.googlesource.com/c/platform/build/+/2724917

Change-Id: Ieee0b6ea843667c9425df2557281b2e5c598c036
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24 10:47:48 +00:00
Vincent Donnefort
f1f3c8ab80 Merge "Revert "Adds modern wallpaper pickers to AOSP installs"" into main am: 07c4b5c0f2 am: 3e8443e18e am: ad81fc0d1d
Original change: https://android-review.googlesource.com/c/platform/build/+/2724917

Change-Id: Ia5e80e11565f97621c58666ccbc3b77c7135f335
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24 10:15:04 +00:00
Vincent Donnefort
ad81fc0d1d Merge "Revert "Adds modern wallpaper pickers to AOSP installs"" into main am: 07c4b5c0f2 am: 3e8443e18e
Original change: https://android-review.googlesource.com/c/platform/build/+/2724917

Change-Id: I3fa9a706433a3c93d1305977b5bb7bb9fc2cd73c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24 09:37:34 +00:00
Vincent Donnefort
3e8443e18e Merge "Revert "Adds modern wallpaper pickers to AOSP installs"" into main am: 07c4b5c0f2
Original change: https://android-review.googlesource.com/c/platform/build/+/2724917

Change-Id: Id7bfcf472ca43e3d705a4ebbac21a703d4998e7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24 08:57:12 +00:00
Vincent Donnefort
07c4b5c0f2 Merge "Revert "Adds modern wallpaper pickers to AOSP installs"" into main 2023-08-24 08:11:04 +00:00
Woody Lin
371905638a Revert "Adds modern wallpaper pickers to AOSP installs"
This reverts commit af76a98608.

Reason for revert: To fix regression test failure on 'WallpaperPickerGoogleTests'
Bug: 297301079

Change-Id: Id9eb21db31182c68551ef9e3c3d4d258879c541b
2023-08-24 05:41:52 +00:00
Chris Poultney
51611e7654 Merge "Adds modern wallpaper pickers to AOSP installs" into main am: 214c0e27e1 am: 6107268165 am: 57a48aaa8e am: 4d7d1a22c8
Original change: https://android-review.googlesource.com/c/platform/build/+/2722713

Change-Id: Iaf7217af984606953a8b5348962ed0e42ed004c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24 04:53:02 +00:00
Chris Poultney
4d7d1a22c8 Merge "Adds modern wallpaper pickers to AOSP installs" into main am: 214c0e27e1 am: 6107268165 am: 57a48aaa8e
Original change: https://android-review.googlesource.com/c/platform/build/+/2722713

Change-Id: Iab4cdfeffd6fbebd62ae35b43a1ebb092e0cedcf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24 04:25:14 +00:00
Chris Poultney
57a48aaa8e Merge "Adds modern wallpaper pickers to AOSP installs" into main am: 214c0e27e1 am: 6107268165
Original change: https://android-review.googlesource.com/c/platform/build/+/2722713

Change-Id: Id998ce6660a492f51a1cbfe1c679cb15d424e8d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24 03:45:46 +00:00
Chris Poultney
6107268165 Merge "Adds modern wallpaper pickers to AOSP installs" into main am: 214c0e27e1
Original change: https://android-review.googlesource.com/c/platform/build/+/2722713

Change-Id: I130a11c65405de6b4d68ec98b86803c0bbcc48a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24 03:04:36 +00:00
Chris Poultney
214c0e27e1 Merge "Adds modern wallpaper pickers to AOSP installs" into main 2023-08-24 02:21:24 +00:00
Kelvin Zhang
f3be5754a0 Merge "Add a tool to generate OTA from images" into main am: 593654a6ab am: 581ccd31e8 am: 58070cdd3e am: 1a38f808c5
Original change: https://android-review.googlesource.com/c/platform/build/+/2722136

Change-Id: Ibac280e350e9c017a3fc18f7029f7bcb74a1f22d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-23 21:42:52 +00:00
Kelvin Zhang
1a38f808c5 Merge "Add a tool to generate OTA from images" into main am: 593654a6ab am: 581ccd31e8 am: 58070cdd3e
Original change: https://android-review.googlesource.com/c/platform/build/+/2722136

Change-Id: Idafa2d8c9ea6071789488c1cf075798507bae3e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-23 21:14:23 +00:00
Kelvin Zhang
58070cdd3e Merge "Add a tool to generate OTA from images" into main am: 593654a6ab am: 581ccd31e8
Original change: https://android-review.googlesource.com/c/platform/build/+/2722136

Change-Id: I233dd9ab95fdafcf88974539349e36f85104b064
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-23 20:34:47 +00:00
Kelvin Zhang
581ccd31e8 Merge "Add a tool to generate OTA from images" into main am: 593654a6ab
Original change: https://android-review.googlesource.com/c/platform/build/+/2722136

Change-Id: I0f2d14e667125ab201b34781ae967534dde6cb46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-23 19:54:09 +00:00
Kelvin Zhang
593654a6ab Merge "Add a tool to generate OTA from images" into main 2023-08-23 19:37:47 +00:00
Kelvin Zhang
c7441e5907 Add a tool to generate OTA from images
During build, we will need to generate an OTA for boot partition using a
16K boot image. Typically, OTA is generated from target_files.zip . To
avoid relying on target_files.zip as a dependency for 16K OTA, add a
tool to generate OTA directly from a raw image.

Test: th, ota_from_raw_img --partition_name boot --output ota.zip $OUT/boot_16k.img
Bug: 293313353
Change-Id: I2076332faf2a8dc573450597efd481e285a49545
2023-08-23 12:37:29 -07:00
Kangping Dong
bd7e6f5d93 Merge "Revert "add com.android.threadnetwork to base_system.mk"" into main am: a169e4f7f6 am: 13aaf50595 am: 21989e8b72 am: 114fc180a2
Original change: https://android-review.googlesource.com/c/platform/build/+/2720033

Change-Id: I77b79395860cb850e56ef6829f782c76636b4c1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-23 10:49:33 +00:00
Kangping Dong
34aa3b1946 Merge "Revert "add service-threadnetwork to system_server jars"" into main am: 2a8b64271d am: 4d5bafc752 am: fcafc708a0 am: 5e0b44c76d
Original change: https://android-review.googlesource.com/c/platform/build/+/2711774

Change-Id: Id1387ebe609ed7d8c32610f7ce87dc26c5240c17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-23 10:49:29 +00:00
Kangping Dong
114fc180a2 Merge "Revert "add com.android.threadnetwork to base_system.mk"" into main am: a169e4f7f6 am: 13aaf50595 am: 21989e8b72
Original change: https://android-review.googlesource.com/c/platform/build/+/2720033

Change-Id: I83437dd2122d9022dd9aef4344cd131dd33de0c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-23 10:22:01 +00:00
Kangping Dong
5e0b44c76d Merge "Revert "add service-threadnetwork to system_server jars"" into main am: 2a8b64271d am: 4d5bafc752 am: fcafc708a0
Original change: https://android-review.googlesource.com/c/platform/build/+/2711774

Change-Id: I66e8edcca82590f956882241c1993a509cfff340
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-23 10:21:56 +00:00
Kangping Dong
21989e8b72 Merge "Revert "add com.android.threadnetwork to base_system.mk"" into main am: a169e4f7f6 am: 13aaf50595
Original change: https://android-review.googlesource.com/c/platform/build/+/2720033

Change-Id: I061353705b5ae7b3948c73bee11ec8dd229b4712
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-23 09:44:32 +00:00
Kangping Dong
fcafc708a0 Merge "Revert "add service-threadnetwork to system_server jars"" into main am: 2a8b64271d am: 4d5bafc752
Original change: https://android-review.googlesource.com/c/platform/build/+/2711774

Change-Id: I1122148b13710be4c9bd90ba253d7ddf1834b1fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-23 09:44:27 +00:00
Kangping Dong
13aaf50595 Merge "Revert "add com.android.threadnetwork to base_system.mk"" into main am: a169e4f7f6
Original change: https://android-review.googlesource.com/c/platform/build/+/2720033

Change-Id: Iaf484a217053498d4a09fbf1addb81c5122df3f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-23 09:05:14 +00:00
Kangping Dong
4d5bafc752 Merge "Revert "add service-threadnetwork to system_server jars"" into main am: 2a8b64271d
Original change: https://android-review.googlesource.com/c/platform/build/+/2711774

Change-Id: Ib17f619164cac2edd4e82876b51033db3b596e97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-23 09:05:10 +00:00
Treehugger Robot
e1f8614398 Merge "Revert "Add BUILD_BROKEN_VENDOR_SEAPP_USES_COREDOMAIN"" into main am: a679e050f5 am: 0d7abde2c0 am: 87e7f90cc0 am: 0c5e918588
Original change: https://android-review.googlesource.com/c/platform/build/+/2722775

Change-Id: I01dab2554b37de48f55c1db5068c84c21693984b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-23 08:57:02 +00:00
Kangping Dong
a169e4f7f6 Merge "Revert "add com.android.threadnetwork to base_system.mk"" into main 2023-08-23 08:37:38 +00:00
Kangping Dong
2a8b64271d Merge "Revert "add service-threadnetwork to system_server jars"" into main 2023-08-23 08:37:38 +00:00
Treehugger Robot
0c5e918588 Merge "Revert "Add BUILD_BROKEN_VENDOR_SEAPP_USES_COREDOMAIN"" into main am: a679e050f5 am: 0d7abde2c0 am: 87e7f90cc0
Original change: https://android-review.googlesource.com/c/platform/build/+/2722775

Change-Id: Ib107b106b034c28e9f358208ac0b3525d48684cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-23 08:29:08 +00:00
Treehugger Robot
87e7f90cc0 Merge "Revert "Add BUILD_BROKEN_VENDOR_SEAPP_USES_COREDOMAIN"" into main am: a679e050f5 am: 0d7abde2c0
Original change: https://android-review.googlesource.com/c/platform/build/+/2722775

Change-Id: If611f221d573d3996c5324377afc9f3a7e8b19a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-23 07:51:58 +00:00