Zhi Dou
b218b19b6a
Merge "DO NOT MERGE: manually cherry pick" into aosp-main-future
2024-08-16 15:45:14 +00:00
Treehugger Robot
1d4cfd945e
Merge "Migrate ramdisk_node_list configuration to Android.bp" into main am: c8a5399192
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3217721
Change-Id: I46e84cd3231535fb80e529ec2f2e73bfeb323bf6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-16 15:08:08 +00:00
Treehugger Robot
c8a5399192
Merge "Migrate ramdisk_node_list configuration to Android.bp" into main
2024-08-16 14:51:15 +00:00
Jooyung Han
f5d16e0a60
Merge "Add /odm/apex/ support." into main am: 113f1f5c7e
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3217178
Change-Id: I4bfb322b0bb7ae1a605f1a98dc3d32048aefb5a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-16 04:00:29 +00:00
Jooyung Han
113f1f5c7e
Merge "Add /odm/apex/ support." into main
2024-08-16 03:46:57 +00:00
Ted Bauer
d79db262a3
Merge "Parse protos in library" into main am: 91458b4cd4
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3222383
Change-Id: Iaad2c4a2996d048bfd727708f1b6fd9acf8dac9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-15 22:35:30 +00:00
Ted Bauer
91458b4cd4
Merge "Parse protos in library" into main
2024-08-15 22:15:19 +00:00
Ted Bauer
6f12acb0da
Parse protos in library
...
Bug: 342636474
Test: m
Change-Id: I4934fa2332b00084f73453945d6b4743566f6e48
2024-08-15 21:04:28 +00:00
Jihoon Kang
887384e80f
Merge "Specify is_stubs_module property in selected aconfig library modules" into main am: 0c26850dba
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3219855
Change-Id: I7287eb40524849f37d26ae103b3eae50bdf5b0f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-15 17:43:57 +00:00
Jihoon Kang
0c26850dba
Merge "Specify is_stubs_module property in selected aconfig library modules" into main
2024-08-15 16:45:16 +00:00
Treehugger Robot
4444476447
Merge "Export variable to soong for converting vintf_compatibility_matrix" into main am: 00378b193d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3195839
Change-Id: Ifb6f5a83399a69e9798a5026901d32aa2c05e303
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-15 09:35:44 +00:00
Treehugger Robot
00378b193d
Merge "Export variable to soong for converting vintf_compatibility_matrix" into main
2024-08-15 09:07:38 +00:00
Jooyung Han
1e45baff6b
Add /odm/apex/ support.
...
We now allow APEXes in /odm.
Bug: 162049873
Change-Id: I2af97504a8d6159e778f8f833335db49beee6873
2024-08-15 07:38:17 +00:00
Nelson Li
1503d8355e
Migrate ramdisk_node_list configuration to Android.bp
...
Removed the hardcoded assignment of `RAMDISK_NODE_LIST` in
`build/core/Makefile`. Instead, a filegroup definition in Android.bp is
now used to manage `ramdisk_node_list` and its export to the make
variable. This change enhances flexibility and simplifies the build
process by eliminating the need for a fixed installation path.
Bug: 359423289
Test: m -j $(PRODUCT_OUT)/ramdisk.img
Change-Id: I5aea108d426a615fa951c368c16f7cdea73252b1
2024-08-15 11:30:47 +08:00
Jihoon Kang
48f2b22b45
Specify is_stubs_module property in selected aconfig library modules
...
"fake_device_config" and "strict_mode_stub" provide stubs and do not
contain any implementation details. Specifying the property
"is_stubs_module" to these modules allow inter-container dependency on
these modules.
Test: m nothing
Bug: 354029496
Change-Id: Ia65ad36ca02c0594fc753935f9cc7c0af6caa20d
2024-08-14 22:23:08 +00:00
Chris Wiseman
04d7e4684c
Merge "Fix build error while creating CHD image" into main am: 3e0319275f
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3217720
Change-Id: Ia35f3db49a26ec853b4058c13558fb508f834bb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-14 19:31:41 +00:00
Chris Wiseman
3e0319275f
Merge "Fix build error while creating CHD image" into main
2024-08-14 19:15:32 +00:00
Treehugger Robot
7ac3941966
Merge "Create transitive-res-packages for prebuilt java libraries" into main am: 232929ccdb
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3202351
Change-Id: Ibda55c4b0c072291cca234521f0b95cfac7450d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-14 16:55:16 +00:00
Treehugger Robot
232929ccdb
Merge "Create transitive-res-packages for prebuilt java libraries" into main
2024-08-14 16:29:31 +00:00
Zhi Dou
57a20538f4
DO NOT MERGE: manually cherry pick
...
Ignore-AOSP-First: manually cherry pick
Change-Id: I3ae88f6af6189b8b96bdf090b40c0942bfa37d01
Test: presubmit
Bug: n/a
2024-08-14 14:13:03 +00:00
JaeMan Park
b3795b7933
Fix build error while creating CHD image
...
While building CHD image, it failed with the error
KeyError: 'system_dlkm_base_fs_file'
Fix the build error by deleting proper props in the python code.
Bug: 359578756
Test: Building CHD image using build_cf_hybrid_device.py should not failed
Change-Id: Iae84ff080b8f6bf3b8d22b26865ea3e74815ac37
2024-08-14 14:11:15 +09:00
Treehugger Robot
32ae3f892b
Merge "Remove module_build_from_source soong config variable" into main am: 5ab8f4a84b
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3216810
Change-Id: I592c584142057aa5a5c6367aafcb786dbed8621c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-14 00:53:07 +00:00
Treehugger Robot
5ab8f4a84b
Merge "Remove module_build_from_source soong config variable" into main
2024-08-14 00:36:57 +00:00
Spandan Das
8a58e78f9e
Remove module_build_from_source soong config variable
...
This value is a noop in V+ trees. It was previously used as one of the
inputs for source vs prebuilts selection of mainline modules.
Bug: 308187800
Test: presubmits
Change-Id: I24432a982b6fadd3e7a1a89c730c8ccc0abb4709
2024-08-13 23:11:15 +00:00
Xin Li
12050eb9c6
Mark 24Q3 (ab/AP3A.240905.015) as merged
...
Bug: 347831320
Merged-In: I39a828922f156397cdfd084361598c7f31114183
Change-Id: Iaa9ab4259f0129fd163e996b0ebd4e3042e51d28
2024-08-13 15:41:38 -07:00
Treehugger Robot
a5b26acddc
Merge "Only read the use_new_storage_value flag once per process." into main am: bdaf14f9e2
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3212787
Change-Id: I3ac230d45a2b4decb0bd6efdeb3bd22f1541df3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-13 19:22:59 +00:00
Treehugger Robot
bdaf14f9e2
Merge "Only read the use_new_storage_value flag once per process." into main
2024-08-13 19:02:08 +00:00
Ted Bauer
f51e1dd28d
Only read the use_new_storage_value flag once per process.
...
Change-Id: Ib088fbcc2283718a309097c7c45fb01d5a983a25
Test: m
Bug: 312235596
2024-08-13 17:16:04 +00:00
Treehugger Robot
7ed5b4ed3a
Merge "target-files: Support erofs_compress_hints" into main am: f55902f65f
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3213595
Change-Id: I1df617ad0cdbafaa75613c473691287e2e3edf84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-13 01:43:54 +00:00
Treehugger Robot
f55902f65f
Merge "target-files: Support erofs_compress_hints" into main
2024-08-13 01:21:02 +00:00
Luca Farsi
4603e032fa
Merge "Change artifact matching to be more strict" into main am: eb086f0d42
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3209313
Change-Id: I73165d779991442fcd0bc996a4cbaae6b0b59ef7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-12 18:08:59 +00:00
Luca Farsi
eb086f0d42
Merge "Change artifact matching to be more strict" into main
2024-08-12 17:50:33 +00:00
Luca Farsi
99d40d7554
Change artifact matching to be more strict
...
The current artifact matching logic will cause any test target that uses
something like .*-tests.zip to be way too broad in what it causes to
build. Change the logic to look for the target name in the artifact
matching regex to make it so that only tests that look for a specific
target to match.
Test: atest build_test_suites_test
Bug: 348489774
Change-Id: Ia75e38b676607f45f2b1c8fcf948045c248f1729
2024-08-12 09:59:11 -07:00
Jooyung Han
52b7214fd3
Merge "Remove setting init.userspace_reboot.is_supported" into main am: 832819e90d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3213601
Change-Id: Id3c34f742ea3938ca81b70f664fabdd3eb2f193b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-12 00:42:57 +00:00
Jooyung Han
832819e90d
Merge "Remove setting init.userspace_reboot.is_supported" into main
2024-08-12 00:41:20 +00:00
Treehugger Robot
2a092d2b01
Merge "Build product/odm build.prop with Soong" into main am: 57ac3a18ea
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3213597
Change-Id: Id80b6d3f789b45f8d2e2bff6c4bd51d8e032eadf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-12 00:36:42 +00:00
Treehugger Robot
57ac3a18ea
Merge "Build product/odm build.prop with Soong" into main
2024-08-12 00:08:32 +00:00
Android Build Coastguard Worker
9e8a38292b
Version bump to AP3A.240905.015 [core/build_id.mk]
...
Change-Id: I39a828922f156397cdfd084361598c7f31114183
2024-08-09 20:55:02 +00:00
Yike Zhang
a6fc08335c
Merge "Link shared libs to x86/x86_64 folder if available" into main am: 651fa75112
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3212234
Change-Id: I66a36b77b86d457c6a330b503fc20c4950570f59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-09 17:36:19 +00:00
Yike Zhang
651fa75112
Merge "Link shared libs to x86/x86_64 folder if available" into main
2024-08-09 17:02:25 +00:00
Jooyung Han
a2f9851521
Remove setting init.userspace_reboot.is_supported
...
Userspace reboot is deprecated.
Bug: 292469129
Test: build cuttlefish.
Test: adb shell getprop init.userspace_reboot.is_supported
Change-Id: I51ded79d3ae3df5363e6a7c9d1c5dcd06163f78e
2024-08-09 14:40:58 +09:00
yike
261e22dd1d
Link shared libs to x86/x86_64 folder if available
...
Currently, the shared libs are not categorized according to arch,
which adds more redundant dependencies at runtime and might mislead
the test execution.
Test: m host-unit-tests
Bug: 351909435
Change-Id: I48f8e6752879cdd4d510ce5b611dc6c118a42f8f
2024-08-09 03:34:08 +00:00
Treehugger Robot
7f937c4bd2
Merge "Export related make variables for gralloc.default to soong" into main am: b3984cac84
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3211281
Change-Id: I2488d9021d4917065f14405e70bb98a141824b61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-09 03:05:25 +00:00
Treehugger Robot
b3984cac84
Merge "Export related make variables for gralloc.default to soong" into main
2024-08-09 02:44:45 +00:00
Android Build Coastguard Worker
f3c1eacd49
[coastguard skipped] Merge sparse cherrypicks from sparse-12192237-L32900030005709642 into 24Q3-release.
...
COASTGUARD_SKIP: I926dbb03a144eb424e0177ff6b27b31700dbdf5b
Change-Id: Ic0bd375ca790ab0d8e5a66292a644e9376443764
2024-08-09 01:54:40 +00:00
Android Build Coastguard Worker
1ab90756d7
Version bump to AP3A.240905.014.Y1 [core/build_id.mk]
...
Change-Id: I926dbb03a144eb424e0177ff6b27b31700dbdf5b
2024-08-09 01:53:27 +00:00
Luca Farsi
5360394e6c
Merge "Refactor OptimizedBuildTarget and add general-tests optimization" into main am: 944fa4f813
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3212227
Change-Id: Icd32e895d7d29ea8a574f154501a83f7eaeaa038
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-08 23:41:26 +00:00
Jooyung Han
67911682c2
target-files: Support erofs_compress_hints
...
erofs_compress_hints files should be copied into target-files and then
sign_target_files_apks should use them from the target-files.
Bug: 357721652
Test: m target-files-package (with aosp/3204257)
Test: sign_target_files_apks <target_file> signed-target-files.zip
Change-Id: Id55000004ecb72ea8fec19bfbe144c9b4d3f06cb
2024-08-09 08:27:19 +09:00
Luca Farsi
944fa4f813
Merge "Refactor OptimizedBuildTarget and add general-tests optimization" into main
2024-08-08 23:16:53 +00:00
Luca Farsi
70a53bd6cf
Refactor OptimizedBuildTarget and add general-tests optimization
...
Refactor the OptimizedBuildTarget base class to more simply handle
enabling/disabling build optimizations based on flags. Now all
optimizers (aside from the no-op NullOptimizer will have their enabling
built into the base class, and also necessitate their get_build_targets
and package_outputs functions to be defined in order to not error out.
Add the GeneralTestsOptimizer class as well, unimplemented for now.
Test: atest build_test_suites_test
Bug: 358215235
Change-Id: Ide22c64fc238d754db8d8e76484947401e54e680
2024-08-08 12:02:57 -07:00