Commit Graph

100555 Commits

Author SHA1 Message Date
Dennis Shen
1760706461 Merge "Treat system_ext as system in container designation" into main am: 6940b7898d am: b0d8105009
Original change: https://android-review.googlesource.com/c/platform/build/+/3261300

Change-Id: I2fa3f3306cd29b7d730020fd015930dfbc899f7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-13 02:20:12 +00:00
Dennis Shen
b0d8105009 Merge "Treat system_ext as system in container designation" into main am: 6940b7898d
Original change: https://android-review.googlesource.com/c/platform/build/+/3261300

Change-Id: I6b457c3870839d75175db66b4365bfa29a8c09a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-13 01:43:30 +00:00
Dennis Shen
6940b7898d Merge "Treat system_ext as system in container designation" into main 2024-09-13 01:21:13 +00:00
Dennis Shen
b3681ad5c6 Treat system_ext as system in container designation
Bug: b/365135457
Test: m
Change-Id: Iece264cdd49d84ef0e5acccdbcf68059c876395f
2024-09-12 23:32:03 +00:00
Treehugger Robot
5bbf6701eb Merge "Expose DeviceProtos' paths to parse in Framework" into main am: 187e280d3c am: ebad1406dc
Original change: https://android-review.googlesource.com/c/platform/build/+/3265027

Change-Id: I984b09f9f5c4c6045c66f81acc0b46197c4705dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-12 22:11:43 +00:00
Treehugger Robot
ebad1406dc Merge "Expose DeviceProtos' paths to parse in Framework" into main am: 187e280d3c
Original change: https://android-review.googlesource.com/c/platform/build/+/3265027

Change-Id: I838a1f482af9232b0795d97c52dfeed5d556d87e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-12 21:52:53 +00:00
Treehugger Robot
187e280d3c Merge "Expose DeviceProtos' paths to parse in Framework" into main 2024-09-12 21:33:17 +00:00
Treehugger Robot
905172ddc7 Merge "aconfig: Don't log matching validated flags" into main am: 1c0e255327 am: 8c56d035d1
Original change: https://android-review.googlesource.com/c/platform/build/+/3262192

Change-Id: Ib907a88258c95d30a4f45cf359666e9e43e48138
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-12 17:01:20 +00:00
Treehugger Robot
8c56d035d1 Merge "aconfig: Don't log matching validated flags" into main am: 1c0e255327
Original change: https://android-review.googlesource.com/c/platform/build/+/3262192

Change-Id: If21fbc5179ee88905b78c106542a1d35a0cece97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-12 16:49:20 +00:00
Treehugger Robot
1c0e255327 Merge "aconfig: Don't log matching validated flags" into main 2024-09-12 16:37:30 +00:00
Treehugger Robot
ae8f73bb36 Merge "Move create_root_structure.mk to the dont_bother block." into main am: 435145d063 am: 9188de2042
Original change: https://android-review.googlesource.com/c/platform/build/+/3261781

Change-Id: Ibd01ca93ea60f57f9def2a78005f8b2b3b34d25b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-12 08:47:38 +00:00
Treehugger Robot
9188de2042 Merge "Move create_root_structure.mk to the dont_bother block." into main am: 435145d063
Original change: https://android-review.googlesource.com/c/platform/build/+/3261781

Change-Id: If909d68bf204e2800b635e4c957241d09047abf6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-12 08:38:13 +00:00
Treehugger Robot
435145d063 Merge "Move create_root_structure.mk to the dont_bother block." into main 2024-09-12 08:29:21 +00:00
Treehugger Robot
e468ef50c3 Merge "Move building bootloader/radio image task to proper place" into main am: c2b351babb am: f00af6db55
Original change: https://android-review.googlesource.com/c/platform/build/+/3261778

Change-Id: Icdcda9c442d1ea2c0f5b8e3722393cea66f1a65d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-12 07:43:41 +00:00
Treehugger Robot
f00af6db55 Merge "Move building bootloader/radio image task to proper place" into main am: c2b351babb
Original change: https://android-review.googlesource.com/c/platform/build/+/3261778

Change-Id: I510b6ad0f56f212a3ba43b402e8b02f8c13aad17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-12 07:34:30 +00:00
Treehugger Robot
c2b351babb Merge "Move building bootloader/radio image task to proper place" into main 2024-09-12 07:22:38 +00:00
Ankita Vyas
ed6fe795ce [automerger skipped] Merge "Add new framework-photopicker inside MediaProvider module" into main am: 69bb727e5a am: 8060c44c0d -s ours
am skip reason: Merged-In Ic29a1097bf73657973174769973e50e7dd985cc6 with SHA-1 d7fb4d6fff is already in history

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

Change-Id: Ia8062a43181bcfb3336b0fb3ff0e4ef11f4765b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-12 06:09:03 +00:00
Ankita Vyas
8060c44c0d Merge "Add new framework-photopicker inside MediaProvider module" into main am: 69bb727e5a
Original change: https://android-review.googlesource.com/c/platform/build/+/3256761

Change-Id: Ib5d734508b5715ff5da9249eac32b4b5097f9665
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-12 06:00:39 +00:00
Yurii Zubrytskyi
45e02d3c76 Expose DeviceProtos' paths to parse in Framework
Framework currently hardcodes the paths to flags protos, with
this change it will be able to reuse the globally defined ones
and also gets access to all APEX flags

Bug: 301491148
Test: build + boot
Flag: EXEMPT build change
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:1e85e40c3ead83585ac3d7c71a712d35cd420a36)
Merged-In: I91dae72c32c47888697914265c90918389aa4c25
Change-Id: I91dae72c32c47888697914265c90918389aa4c25
2024-09-12 05:53:21 +00:00
Ankita Vyas
69bb727e5a Merge "Add new framework-photopicker inside MediaProvider module" into main 2024-09-12 05:46:50 +00:00
Treehugger Robot
c170e080a2 Merge "Add a new Soong config variable EMMA_INSTRUMENT" into main am: 1d09815d07 am: 44b86ab2c2
Original change: https://android-review.googlesource.com/c/platform/build/+/3247731

Change-Id: Ib4c6f9e8bd8d7c5da59a00c5830ecc1dc0bef697
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-12 03:21:06 +00:00
Treehugger Robot
44b86ab2c2 Merge "Add a new Soong config variable EMMA_INSTRUMENT" into main am: 1d09815d07
Original change: https://android-review.googlesource.com/c/platform/build/+/3247731

Change-Id: Ie453d1d17fcd3b3fa698146f89d57eca9d58a7de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-12 03:12:12 +00:00
Treehugger Robot
1d09815d07 Merge "Add a new Soong config variable EMMA_INSTRUMENT" into main 2024-09-12 03:09:24 +00:00
Treehugger Robot
fd552de10e Merge "Add 16K boot image and dtbo image to dependency list of target files" into main am: ec37b55bc8 am: 8206631a1e
Original change: https://android-review.googlesource.com/c/platform/build/+/3264300

Change-Id: I6794d88b3c506d865bd52b3eb66053efd4b8245e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-12 00:45:12 +00:00
Treehugger Robot
582de92ec0 Merge "Add soong system image configs" into main am: 0908f9d93d am: f1908a5945
Original change: https://android-review.googlesource.com/c/platform/build/+/3235506

Change-Id: I0af137c15a1e7d76e409c1d0301281281a036a1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-12 00:44:33 +00:00
Treehugger Robot
8206631a1e Merge "Add 16K boot image and dtbo image to dependency list of target files" into main am: ec37b55bc8
Original change: https://android-review.googlesource.com/c/platform/build/+/3264300

Change-Id: I83e734c0c11b4060995eff68b7b09912810e6fbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-12 00:34:29 +00:00
Treehugger Robot
f1908a5945 Merge "Add soong system image configs" into main am: 0908f9d93d
Original change: https://android-review.googlesource.com/c/platform/build/+/3235506

Change-Id: Ie53cca68f72855d66386efc9a3fdb38a7f3f5bdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-12 00:33:57 +00:00
Treehugger Robot
ec37b55bc8 Merge "Add 16K boot image and dtbo image to dependency list of target files" into main 2024-09-12 00:29:16 +00:00
Treehugger Robot
0908f9d93d Merge "Add soong system image configs" into main 2024-09-12 00:25:22 +00:00
Kelvin Zhang
06b08b0369 Merge "Fix OTA package re-sign on release key servers" into main am: 278f34add3 am: 677627cbde
Original change: https://android-review.googlesource.com/c/platform/build/+/3263774

Change-Id: I59690676ff534103add111dbca4885127f34baed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-12 00:24:23 +00:00
Kelvin Zhang
677627cbde Merge "Fix OTA package re-sign on release key servers" into main am: 278f34add3
Original change: https://android-review.googlesource.com/c/platform/build/+/3263774

Change-Id: If116f5f8843adf02fefc97c1d75ac9f83b6bd6d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-12 00:13:03 +00:00
Kelvin Zhang
278f34add3 Merge "Fix OTA package re-sign on release key servers" into main 2024-09-12 00:09:00 +00:00
Kelvin Zhang
8ac5145307 Add 16K boot image and dtbo image to dependency list of target files
In aosp/3236458 these two artifacts are added to target-files.zip, but
they are not listed as dependency of target-files.zip. Depending on
build order and clean spec, sometimes this leads to missing files.

Test: th
Change-Id: I70e3b3691e77112c2427d95930b0c27a8042884b
2024-09-11 16:31:06 -07:00
Jared Duke
f43413c53f aconfig: Don't log matching validated flags
Avoid log spam by skipping log statements for matching validated flag
entries in the Java codegen. Also change any mismatched logs from
info to warning.

Change-Id: Icb8bba38d8594438757d76957c4c0188f6c2758a
Test: atest aconfig.test
Flag: EXEMPT bugfix
2024-09-11 23:15:58 +00:00
Kelvin Zhang
4837944712 Fix OTA package re-sign on release key servers
Release key signing passes more args than just --package_key, honor
these flags properly in signing script.

Test: th
Bug: 354019928
Change-Id: I49215e92f28da2ac4cd72fb9e5c6bbc94a3e3f02
2024-09-11 16:07:04 -07:00
Treehugger Robot
13120197d4 Merge "Add flag for enabling only new storage and use in aflags" into main am: 44bebf7ccb am: aac4eae6d7
Original change: https://android-review.googlesource.com/c/platform/build/+/3263578

Change-Id: I2abd3e20938f8701909f7047ee8911b1b102939a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-11 22:18:12 +00:00
Treehugger Robot
e8d128c350 Merge "Move copy destination to "sts-sdk"" into main am: 6fbebd4570 am: 3d9f7146e4
Original change: https://android-review.googlesource.com/c/platform/build/+/3254921

Change-Id: I31a53129e713703540a62a86eed2439d7ada5a67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-11 22:15:00 +00:00
Treehugger Robot
aac4eae6d7 Merge "Add flag for enabling only new storage and use in aflags" into main am: 44bebf7ccb
Original change: https://android-review.googlesource.com/c/platform/build/+/3263578

Change-Id: I5339ef58855497d11990a2d02645ea3ed659149b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-11 22:05:06 +00:00
Treehugger Robot
3d9f7146e4 Merge "Move copy destination to "sts-sdk"" into main am: 6fbebd4570
Original change: https://android-review.googlesource.com/c/platform/build/+/3254921

Change-Id: I37af4bc9fc5d1dcc876d99e8b024cb50840dd4ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-11 22:04:51 +00:00
Treehugger Robot
44bebf7ccb Merge "Add flag for enabling only new storage and use in aflags" into main 2024-09-11 21:58:52 +00:00
Treehugger Robot
6fbebd4570 Merge "Move copy destination to "sts-sdk"" into main 2024-09-11 21:58:14 +00:00
Treehugger Robot
c592fca2a3 Merge "Add missing vendor_kernel_ramdisk dependency to target-files.zip" into main am: edb3ba3ae4 am: 03fba52422
Original change: https://android-review.googlesource.com/c/platform/build/+/3260543

Change-Id: Ia3e7900966675813cdbb678f2dc6350e348275c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-11 20:53:21 +00:00
Treehugger Robot
03fba52422 Merge "Add missing vendor_kernel_ramdisk dependency to target-files.zip" into main am: edb3ba3ae4
Original change: https://android-review.googlesource.com/c/platform/build/+/3260543

Change-Id: I19e9c9c319800c733608ad95346dbc0f2df3fc4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-11 20:42:49 +00:00
Treehugger Robot
edb3ba3ae4 Merge "Add missing vendor_kernel_ramdisk dependency to target-files.zip" into main 2024-09-11 20:33:35 +00:00
Ted Bauer
b1edaae899 Add flag for enabling only new storage and use in aflags
Change-Id: I73218de38d005d77987d5103364a102cec3abc07
Test: m && cargo t
Bug: 324436145
2024-09-11 20:24:47 +00:00
Luca Farsi
4d3c8d9c96 Merge "Refactor package_outputs" into main am: b5484c4b5b am: 45fba22b56
Original change: https://android-review.googlesource.com/c/platform/build/+/3261359

Change-Id: I99ac964157287844d12e5db9ea9b2b241b5d1d81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-11 18:19:54 +00:00
Luca Farsi
45fba22b56 Merge "Refactor package_outputs" into main am: b5484c4b5b
Original change: https://android-review.googlesource.com/c/platform/build/+/3261359

Change-Id: I5572cb8552793f533ed8490b4bbcdda4af30949e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-11 18:11:08 +00:00
Luca Farsi
b5484c4b5b Merge "Refactor package_outputs" into main 2024-09-11 18:05:27 +00:00
Colin Cross
757d8cb7fd Add missing vendor_kernel_ramdisk dependency to target-files.zip
The rule that builds target-files.zip has no dependency on the
vendor_kernel_ramdisk image, which means the files in that image
may not be in place when target-filse.zip is built, causing a
build error:
mkbootfs: cannot open directory '/mnt/disks/build-disk/src/googleplex-android/aosp-main-future-without-vendor/out/target/product/cheetah/obj/PACKAGING/target_files_intermediates/aosp_cheetah-target_files/VENDOR_KERNEL_BOOT/RAMDISK': No such file or directory

Add the missing dependency.

Bug: 365887100
Test: none
Flag: EXEMPT bugfix
Change-Id: I5cdec9bbb35970e4d5e27a6b10ad118ce11835a9
2024-09-11 11:03:36 -07:00
Nelson Li
87ef4b8aee Move create_root_structure.mk to the dont_bother block.
Bug: 353642907
Test: m -j init.environ.rc
Change-Id: I54671a194dbf2005286cb8386cafd93fbef75975
2024-09-11 16:46:45 +08:00