Commit Graph

99868 Commits

Author SHA1 Message Date
Treehugger Robot
8867cacc31 Merge "Move large_screen_common.mk to AOSP" into main am: 7337727e7a
Original change: https://android-review.googlesource.com/c/platform/build/+/3220401

Change-Id: I296e3dad3c329af54bef78d68448c377ab683eb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-19 22:39:30 +00:00
Xin Li
9a3ec3465e Merge "Merge aosp-24Q3-ts-dev" into aosp-main-future 2024-08-19 22:38:56 +00:00
Treehugger Robot
7337727e7a Merge "Move large_screen_common.mk to AOSP" into main 2024-08-19 22:05:21 +00:00
Alex Klein
af49729c5a make/core/Makefile: Skip images for local builds by default.
Packing and archiving the image are expensive operations.
Swap the image archive to dist-files for builders, and skip
building the raw image locally unless it's specifically
requested via the new PHONY targets.

Bug: None
Test: m, m dist, m pack-image
Change-Id: I2a3f1ebea689c23da88ca6d0757b827b7eb0c936
2024-08-19 11:43:06 -06:00
Prochin Wang
aefcbf683c Merge "Add trendy team for Pixel Troubleshooting App" into main am: 104b7e4967
Original change: https://android-review.googlesource.com/c/platform/build/+/3222583

Change-Id: Ie6e9c542c5fb7ab55d254b269458c42b3d975744
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-18 15:14:36 +00:00
Prochin Wang
104b7e4967 Merge "Add trendy team for Pixel Troubleshooting App" into main 2024-08-18 14:59:04 +00:00
Prochin Wang
9cdac7ae1e Add trendy team for Pixel Troubleshooting App
Bug: 360332619
Test: m
Change-Id: I2ba6fb2009186b0ba439c66e348f65050e684ed2
2024-08-17 14:42:02 +00:00
Abu Alkali
4954d2acf4 Merge "Add trendy team for android media solutions playback" into main am: 1afb74365c
Original change: https://android-review.googlesource.com/c/platform/build/+/3218475

Change-Id: I61bbafad7a2558bcf3166bfa3ab1351ebed75327
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-16 21:48:37 +00:00
Abu Alkali
1afb74365c Merge "Add trendy team for android media solutions playback" into main 2024-08-16 21:25:33 +00:00
Wei Li
e4886caa0f Merge "Creating a Trendy team rule for PTE-SysUI Bug: 351846385 Test: Manual Ignore-AOSP-First: Internal only (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d4b0b5d405fc577ac879bf942428689b2f756ff1) Merged-In: Id988d4c9d74a20a2a6471bdbae596c8772ac8cf5 Change-Id: Id988d4c9d74a20a2a6471bdbae596c8772ac8cf5" into main am: c66e326c1d
Original change: https://android-review.googlesource.com/c/platform/build/+/3225902

Change-Id: I987ef2a4b44579a559ef0069c52442762db9ef51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-16 21:14:47 +00:00
Wei Li
c66e326c1d Merge "Creating a Trendy team rule for PTE-SysUI Bug: 351846385 Test: Manual Ignore-AOSP-First: Internal only (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d4b0b5d405fc577ac879bf942428689b2f756ff1) Merged-In: Id988d4c9d74a20a2a6471bdbae596c8772ac8cf5 Change-Id: Id988d4c9d74a20a2a6471bdbae596c8772ac8cf5" into main 2024-08-16 20:55:12 +00:00
Sheetal Pagadakula
708f8a0740 Creating a Trendy team rule for PTE-SysUI
Bug: 351846385
Test: Manual
Ignore-AOSP-First: Internal only
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d4b0b5d405fc577ac879bf942428689b2f756ff1)
Merged-In: Id988d4c9d74a20a2a6471bdbae596c8772ac8cf5
Change-Id: Id988d4c9d74a20a2a6471bdbae596c8772ac8cf5
2024-08-16 20:14:55 +00:00
Zhi Dou
e4c2af820d Merge "Revert^2 "DO NOT MERGE: manually cherry pick"" into aosp-main-future 2024-08-16 19:55:51 +00:00
Hieu Nguyen
5ebc4febe6 Fix problem of RepackApexPayload when using option --signing_args
The apex_util -> deapexer transition still passes signing args in as 1
huge string, just without the double qoutes. Once deapexer receives
the arugment, deapexer would attempt to shlex it, but double
quotes prevents proper shlexing, hence remove the double quotes.
As we added to log to monitor args parser when run apexer from
RepackApexPayload

2024-07-30 12:42:03 - common.py - INFO    :   Individual args list:
['/home/hieu/aosp/out/host/linux-x86/bin/apexer', '--force',
'--payload_only', '--do_not_check_keyname', '--apexer_tool_path',
'/home/hieu/aosp/out/host/linux-x86/bin:/home/hieu/aosp/out/host/linux-x86/bin:/home/hieu/aosp/out/host/linux-x86/bin:/home/hieu/aosp/prebuilts/clang/host/linux-x86/llvm-binutils-stable:/home/hieu/aosp/prebuilts/asuite/acloud/linux-x86:/home/hieu/aosp/prebuilts/asuite/aidegen/linux-x86:/home/hieu/aosp/prebuilts/asuite/atest/linux-x86:/home/hieu/aosp/prebuilts/jdk/jdk17/linux-x86/bin:/home/hieu/aosp/build/bazel/bin:/home/hieu/aosp/development/scripts:/home/hieu/aosp/prebuilts/devtools/tools:/home/hieu/aosp/prebuilts/misc/linux-x86/dtc:/home/hieu/aosp/prebuilts/misc/linux-x86/libufdt:/home/hieu/aosp/prebuilts/android-emulator/linux-x86_64:/home/hieu/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/usr/lib/wsl/lib:/mnt/c/Program Files/WindowsApps/MicrosoftCorporationII.WindowsSubsystemForLinux_2.2.4.0_x64__8wekyb3d8bbwe:/mnt/c/WINDOWS/system32:/mnt/c/WINDOWS:/mnt/c/WINDOWS/System32/Wbem:/mnt/c/WINDOWS/System32/WindowsPowerShell/v1.0/:/mnt/c/WINDOWS/System32/OpenSSH/:/mnt/c/Program Files/7-Zip:/mnt/c/Users/hnguy140/AppData/Local/Microsoft/WindowsApps:/snap/bin', '--manifest', '/tmp/tmpjk8as91m/apex_manifest.pb', '--build_info', '/tmp/tmpjk8as91m/apex_build_info.pb',
'--key', 'key_dir/avb.pem',
'--signing_args', '--signing_helper_with_files external/fnv/production-sign-tools/production-signing-scripts/IVIMB/signing_helper/avb_signing_helper.py',
'/tmp/tmpji2gvei4', '/tmp/tmpjk8as91m/apex_payload.img', '-v']

As monitor from the above log '--signing_helper_with_files
.../avb_signing_helper.py' is considered as a single argument which make
apexer to be confused. The correct ways of parsing arguments is
'--signing_helper_with_files' and '.../avb_signing_helper' should be
separate to 2 arguments instead merge it as one like current
implementation.

Change-Id: I913b6b3f2ff03d8ce2333b1c2c38178967766778
Signed-off-by: Hieu Nguyen <hnguy140@ford.com>
2024-08-16 17:43:08 +00:00
Zhi Dou
36d279f781 Revert^2 "DO NOT MERGE: manually cherry pick"
eb8140f1f4

Change-Id: Ic714001c059599358cd3b972df34110625e18253
2024-08-16 17:30:25 +00:00
Priyanka Advani (xWF)
f91af46355 Merge "Revert "DO NOT MERGE: manually cherry pick"" into aosp-main-future 2024-08-16 17:28:40 +00:00
Priyanka Advani (xWF)
eb8140f1f4 Revert "DO NOT MERGE: manually cherry pick"
Revert submission 28822444-manually_cp

Reason for revert: Droidmonitor created revert due to b/360378804.

Reverted changes: /q/submissionid:28822444-manually_cp

Change-Id: I2ea993388efb4b22d91d19c8c3017f52e44235d3
2024-08-16 17:18:19 +00:00
Xin Li
d18271c0c2 Merge aosp-24Q3-ts-dev
Bug: 358400644
Merged-In: Ia1f94ba19bab1f2e3b129827ad5634023290dbc5
Change-Id: Id01fbfb019f65f082b0b26897224260d38e4db59
2024-08-16 10:15:02 -07:00
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
Raul E Rangel
d44b475942 Move large_screen_common.mk to AOSP
Move this to AOSP to allow partners easier access to the file.

Bug: 357647152
Test: m
Change-Id: I8b21b1461298fbde97e9f5b78bb519c6be864118
2024-08-15 10:22:10 -06: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
Abdelrahman Daim
358ed39d53 Use TARGET_OUT instead of TARGET_OUT_SYSTEM
Summary: There is a bug in aosp source which  tries to use a variable TARGET_OUT_SYSTEM that never gets defined anywhere else. This patches to use TARGET_OUT which maps to the path $(PRODUCT_OUT)/system.

Test: Successful Build on master branch

Change-Id: I89296b8df0a68258337db8fd6fa8a6c9d43f7af1
Signed-off-by: Abdelrahman Daim <adaim@meta.com>
2024-08-14 07:55:25 -07: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
Qing Shen
2c7fb2df08 Add a coverage suffix to avoid Ninja file regeneration.
This CL uses the environment variable, EMMA_INSTRUMENT to determine whether or not coverage is enabled. If coverage is enabled, it adds a bunch of suffixes to the files generated in out/soong/ folders.

This change reduces the build time by avoiding ninja regeneration when users simply switches from atest to atest --experimental-coverage, or vice versa, and no Android.bp changes are made.

Bug: 331444846
Test: Locally run m libc, and then EMMA_INSTRUMENT m libc twice, no ninja regenerations required. Compared the hash of out/target/product/vsoc_x86_64/ between the before-change repo and after-change repo. Only diff is the after-change directory contains an extra file `out/target/product/vsoc_x86_64/.installable_files` while the original directory has only `out/target/product/vsoc_x86_64/.installable_files.previous`, both files have the same hash.
Change-Id: I91eb1134ac552f47a40f3d5ddaab630d146b0773
2024-08-14 01:21:56 +00: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
Lajos Molnar
7b854c7783 Add trendy team for android media solutions playback
Change-Id: I8df367297afa176c0b371380a3871b49465b038f
Test: none
Bug: 358233187
2024-08-13 20:37:37 +00: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