Commit Graph

100057 Commits

Author SHA1 Message Date
Treehugger Robot
b51df30f56 Merge "Don't show staged value if flag is RO" into main am: 112c4886c7
Original change: https://android-review.googlesource.com/c/platform/build/+/3268192

Change-Id: Ib6ba91a642f719d603907adbe8c323582badec49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-16 17:54:11 +00:00
Treehugger Robot
112c4886c7 Merge "Don't show staged value if flag is RO" into main 2024-09-16 16:58:33 +00:00
Ronish Kalia
2ed542a0b9 Merge "Update metadata target to the correct one" into main am: d79c96f7bf
Original change: https://android-review.googlesource.com/c/platform/build/+/3267764

Change-Id: I4d474a6d52c3b932d2eba1629a8976a6aee4c905
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-16 16:22:40 +00:00
Marybeth Fair
91b3cef7d1 Merge "Add ability to manually write to binary files." into main am: a323229292
Original change: https://android-review.googlesource.com/c/platform/build/+/3264236

Change-Id: I197770d016473b6ef2f5c7c9f9f3ae59dc0992b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-16 16:21:26 +00:00
Ronish Kalia
d79c96f7bf Merge "Update metadata target to the correct one" into main 2024-09-16 16:17:22 +00:00
Marybeth Fair
a323229292 Merge "Add ability to manually write to binary files." into main 2024-09-16 15:57:24 +00:00
Ted Bauer
431f44a314 Don't show staged value if flag is RO
Bug: 324436145
Change-Id: I493421f29d6e7f5e844dd47cc6417b3d5fe9cdbb
Test: m aflags && aflags list
2024-09-16 15:50:50 +00:00
Marybeth Fair
45b0438cc0 Add ability to manually write to binary files.
I was updating the format of PackageTableHeader to add an additional
field (and due to that change incremented the file version). This broke
several tests under aconfig_storage_read_api and
aconfig_storage_write_api that were operating on files written in the
old schema. I tried to re-generate them using aconfig create-storage as
explained in aosp/2933375, but was having some trouble. Figure if we can
just update the files directly it will be easier to make updates in the
future anyway. This isn't bypassing logic that's tested - IIUC the tests
cover reading the file correctly (writing is covered in separate tests).

Usage:
$ aconfig-storage print --file=path/to/flag.map --type=flag_map
--format=json > flag_map.json
$ vim flag_map.json // Manually make updates
$ aconfig-storage write-bytes --input-file=flag_map.json
--output-file=path/to/flag.map --type=flag_map

Change-Id: I212bf0b97483740b30130eb121acb895d350da84
Test: manual (adding debug-only tooling) + cargo t
Bug: 316357686
2024-09-16 10:30:04 -04:00
Jeongik Cha
01d8a58381 Merge "Use Soong-defined system image's artifacts in target_files.zip" into main am: 5d7cbb6579
Original change: https://android-review.googlesource.com/c/platform/build/+/3261782

Change-Id: I156dd0623f26d3af0951abb4d822ef674ef43405
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-13 23:44:44 +00:00
Ronish Kalia
f7c2fbef9f Update metadata target to the correct one
Bug: 326986729
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:3fb924d1eddfe031d799f34a2f32d39b9b671a44)
Merged-In: I3da3d31abd3280f85aad30f81151502ec32fc368
Change-Id: I3da3d31abd3280f85aad30f81151502ec32fc368
2024-09-13 23:38:46 +00:00
Jeongik Cha
5d7cbb6579 Merge "Use Soong-defined system image's artifacts in target_files.zip" into main 2024-09-13 23:29:12 +00:00
Luca Farsi
287619c4a3 Merge "Implement package_outputs in GeneralTestsOptimizer" into main am: 58923f2da8
Original change: https://android-review.googlesource.com/c/platform/build/+/3248582

Change-Id: I70ac5b55f64a397aa87988cb244b9dd839ea1710
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-13 20:43:40 +00:00
Luca Farsi
58923f2da8 Merge "Implement package_outputs in GeneralTestsOptimizer" into main 2024-09-13 20:24:38 +00:00
Treehugger Robot
323c046d44 Merge "Fix error in payload_signer_args passing" into main am: 703b4830dc
Original change: https://android-review.googlesource.com/c/platform/build/+/3267753

Change-Id: I3ed6d85a1f1199ecf891722609ecf5e17928b6f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-13 18:07:17 +00:00
Treehugger Robot
703b4830dc Merge "Fix error in payload_signer_args passing" into main 2024-09-13 17:46:02 +00:00
Ted Bauer
d33f812022 Merge "Show containers in list new storage" into main am: 0eb513b222
Original change: https://android-review.googlesource.com/c/platform/build/+/3266997

Change-Id: Ib6d582ffa49b2a531b847c6a648b7f978b2597f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-13 17:17:07 +00:00
Treehugger Robot
7a08b486df Merge "Allow mix of full and incremental updates in OTA" into main am: e1e07f892e
Original change: https://android-review.googlesource.com/c/platform/build/+/3265835

Change-Id: I0fcc844e840ecac0e73824d2f483ad1138ca1258
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-13 17:14:19 +00:00
Ted Bauer
0eb513b222 Merge "Show containers in list new storage" into main 2024-09-13 17:13:13 +00:00
Ted Bauer
83d2a58dd9 Show containers in list new storage
Test: m
Bug: 324436145
Change-Id: I695aa130aee356451aa8196911d31b87d45d745d
2024-09-13 17:08:31 +00:00
Treehugger Robot
e1e07f892e Merge "Allow mix of full and incremental updates in OTA" into main 2024-09-13 16:56:44 +00:00
Kelvin Zhang
e2b7599437 Fix error in payload_signer_args passing
payload_signer_args is a list returned from shlex.split, need to unparse
it before passing to shell CLI

Test: th
Bug: 354019928
Change-Id: I4d308557b5bb808bf34c9d4514408c21176c81f6
2024-09-13 16:53:33 +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
Kelvin Zhang
71565fb070 Allow mix of full and incremental updates in OTA
This allows a subset of partitions to be updated in in full OTA fashion
when generating an incremental OTA. The benefit is faster OTA
generation(mostly for testing purposes).

Test: th
Bug: 365843325
Change-Id: Iff9f649c0646342eb9bdece9a46c942cb432b5e8
2024-09-12 18:19:14 -07: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
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
Luca Farsi
64598e8dec Implement package_outputs in GeneralTestsOptimizer
Implement the output packaging step in the GeneralTestsOptimizer. This
step takes all the outputs built by the general-tests target (in the
case where it was optimized) and packages them into the necessary zips
generated by the target normally.

Test: atest build_test_suites_test; atest optimized_targets_test
Bug: 358215235
Change-Id: I5d27eef4e37137cc9b6e235f52f3856ba0b30460
2024-09-12 14:02:12 -07: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
Jeongik Cha
83db9510d0 Use Soong-defined system image's artifacts in target_files.zip
To ensure the artifacts is ready, add SOONG_DEFINED_SYSTEM_IMAGE_PATH
as an explict dependency of target_files

Bug: 350599478
Test: m dist
Test: check ninja deps
Change-Id: I7adf5c55a3b52da2bd160f930b6f6f100e648e86
2024-09-12 22:10:44 +09: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
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
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
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
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
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
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