Commit Graph

100084 Commits

Author SHA1 Message Date
Treehugger Robot
a3c3cdce43 Merge "aconfig: cpp test-mode lib" into main am: 8e571eea6d
Original change: https://android-review.googlesource.com/c/platform/build/+/3272287

Change-Id: Id0a1b12a39c9733a51e8c492fe05004a3a0c3be9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-19 17:48:39 +00:00
Treehugger Robot
8e571eea6d Merge "aconfig: cpp test-mode lib" into main 2024-09-19 17:42:29 +00:00
Wei Li
8c0d7cd133 Merge "Add command line tool that generates NOTICE.xml.gz for partitions." into main am: 9c3097d5fb
Original change: https://android-review.googlesource.com/c/platform/build/+/3271576

Change-Id: I0a447f26a32ee351271ddbd6c8a3c91fb31978e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-19 17:41:58 +00:00
Wei Li
9c3097d5fb Merge "Add command line tool that generates NOTICE.xml.gz for partitions." into main 2024-09-19 17:37:06 +00:00
Treehugger Robot
54f7f3cce5 Merge "Add etc/bpf/uprobestats/ProcessManagement.o in allowlist" into main am: 8a1e78aa9c
Original change: https://android-review.googlesource.com/c/platform/build/+/3273919

Change-Id: Idfbd6318f2aa41397dbcc31853ab5a852e81000c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-19 17:12:04 +00:00
Treehugger Robot
8a1e78aa9c Merge "Add etc/bpf/uprobestats/ProcessManagement.o in allowlist" into main 2024-09-19 17:04:32 +00:00
Jeongik Cha
392c0c954d Add etc/bpf/uprobestats/ProcessManagement.o in allowlist
to unblock build failure

Bug: 351698657
Bug: 368185982
Test: build
Change-Id: I1017091dd26cd74b471d1d71c3f3b6ad80a0c50a
2024-09-20 00:29:03 +09:00
Treehugger Robot
8f91d9801d Merge "Export USE_CAMERA_V4L2_HAL to soong" into main am: 48a08682fa
Original change: https://android-review.googlesource.com/c/platform/build/+/3256421

Change-Id: I26408ce51b0c23bb7a08497543b2456e99ea466c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-19 01:37:06 +00:00
Treehugger Robot
48a08682fa Merge "Export USE_CAMERA_V4L2_HAL to soong" into main 2024-09-19 01:14:21 +00:00
William Escande
01d6bb3aae aconfig: cpp test-mode lib
Incompatible interface between test-mode and normal mode.

Bluetooth is linking the normal flag for the code that is shipped, and
it is linking the test-mode library for unit testing.
While trying to move some test to use the test-mode, we noticed some
failure as the flag returned were not the one expected.

It appear the code and the test are built against 2 different library,
but linked against one.
The provide interface only contains getter in normal mode, and it is
alternating between getter/setter in test-mode.
By moving the setter in test-mode toward the end of the interface, we
are not modifying the assumed order for the code built against the
normal mode.

This CL is a short term fix, to make the test goes green and prevent
immediat failure. An refactor of the cpp generated code should be done
to avoid using 2 different version of the same symbol in 2 different
libs.

Bug: 311772251
Test: atest aconfig.test
Change-Id: I97f6523452c451d005d2e92bfa1ef861611ab840
2024-09-18 18:01:20 -07:00
Wei Li
e4c1ec9466 Add command line tool that generates NOTICE.xml.gz for partitions.
The tool currently generates a XML file with the root element only and its content will be filled in in following CLs.

Also disable the generation of NOTICE.xml.gz in make when USE_SOONG_DEFINED_SYSTEM_IMAGE is true, so the Soong module could be used without conflict.

Bug: 330949782
Bug: 338342381
Test: lunch aosp_cf_x86_64_phone-trunk_staging-eng && m, and check that system/etc/NOTICE.xml.gz have all the XML elements.
Test: lunch aosp_cf_x86_64_phone_soong_system-trunk_staging-eng && m, and check that system/etc/NOTICE.xml.gz has root element only.
Change-Id: I82e90bd9aa3dabc605acfe8da697ab1f7e7ecf9b
2024-09-18 20:48:34 +00:00
Ashutosh Agarwal
07fca5b929 Merge "Update core/Makefile to add variable PRODUCT_EXTRA_STUB_LIBRARIES." into main am: f09a84419c
Original change: https://android-review.googlesource.com/c/platform/build/+/3272171

Change-Id: I16aad101ed5af364d716e12190c3a42476816fb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-18 18:18:03 +00:00
Ashutosh Agarwal
f09a84419c Merge "Update core/Makefile to add variable PRODUCT_EXTRA_STUB_LIBRARIES." into main 2024-09-18 17:54:39 +00:00
Ashutosh Agarwal
f0f939409d Update core/Makefile to add variable PRODUCT_EXTRA_STUB_LIBRARIES.
This allows products to specify additional device-specific stub libraries that should be included in the system_linker_config. This is useful for products that need to include additional stub libraries that are not picked up by Soong automatically.

Bug: 361441210
Change-Id: Ia18c476e249ac5b14b43819fa0a4f0059dc620de
2024-09-18 14:24:05 +00:00
Dennis Shen
390991bd61 Merge "aconfig: update cpp_codegen to just read from new storage" into main am: 5b6b40e037
Original change: https://android-review.googlesource.com/c/platform/build/+/3266995

Change-Id: I23865ea3825b1ff9da37eb2ecd12c1f53723d032
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-18 02:12:36 +00:00
Dennis Shen
5b6b40e037 Merge "aconfig: update cpp_codegen to just read from new storage" into main 2024-09-18 01:53:30 +00:00
Dennis Shen
ee4e44ade7 aconfig: update cpp_codegen to just read from new storage
Change-Id: Ifc5886e587a64da0d940df903f972593c5e9c9d8
2024-09-17 21:11:22 +00:00
Zhuoyao Zhang
01b092672d Merge "Bootstrap the edit monitor project" into main am: cd1908f552
Original change: https://android-review.googlesource.com/c/platform/build/+/3261331

Change-Id: I08fad0ebc49c7fb005d57e1d85995a4562156d91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-17 20:52:42 +00:00
Zhuoyao Zhang
cd1908f552 Merge "Bootstrap the edit monitor project" into main 2024-09-17 20:14:39 +00:00
Dennis Shen
17b96f3ebc Merge "aconfig: update rust_codegen to just read from new storage when flag is true" into main am: 869fdd13e8
Original change: https://android-review.googlesource.com/c/platform/build/+/3267213

Change-Id: I9c9d3aac91323ffcb7a91de9d9fce87c31be5b9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-17 19:32:20 +00:00
Zhuoyao Zhang
9e103e98e0 Bootstrap the edit monitor project
Add basic files required for the edit monitor project.

The project aims to monitor file changes on Android source trees that are checked out to local disk and upload the edit event logs for post analysis. More details and design doc can be found in the bug.

Bug: b/365617369
Test: None
Change-Id: Ie5e2bdb0747823f200c87ebe071f5f9a2e567b46
2024-09-17 19:16:55 +00:00
Dennis Shen
869fdd13e8 Merge "aconfig: update rust_codegen to just read from new storage when flag is true" into main 2024-09-17 19:14:14 +00:00
Dennis Shen
1b0a6667b1 aconfig: update rust_codegen to just read from new storage when flag is true
This is the last launch of new storage. Use the flag enable_only_new_storage to control if the rust codegen should read from new storage or old storage.

Change-Id: Id2bea8df191a939acb5e07b6a9ac8dc1ddd0f7fb
2024-09-17 15:03:59 +00:00
Kelvin Zhang
a877e85601 Merge "Fix missing signer arg error after re-generate OTA" into main am: 0b181c9098
Original change: https://android-review.googlesource.com/c/platform/build/+/3269802

Change-Id: Iaf03748655fc8741fc0620a6b25cd6e547ebf9cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-16 21:27:44 +00:00
Kelvin Zhang
0b181c9098 Merge "Fix missing signer arg error after re-generate OTA" into main 2024-09-16 21:01:55 +00:00
Kelvin Zhang
c0ae029e87 Fix missing signer arg error after re-generate OTA
sign_target_files_apks invokes ota_from_raw_img's main function directly(without creating a new process). As a result, flag overrides in  ota_from_raw_img impacts further signing. To fix, remove unnecessary flag overrides.

Test: th
Bug: 365697483
Change-Id: Iaf6ad4132afcab4912bd4b9ea002bfa3d9a1462a
2024-09-16 21:01:45 +00:00
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