Commit Graph

98612 Commits

Author SHA1 Message Date
Treehugger Robot
2f0d0b861b Merge "Fix problem of RepackApexPayload when using option --signing_args" into main 2024-08-22 18:01:13 +00:00
Treehugger Robot
939326d3be Merge "Re-generate 4K boot OTAs using signed boot.img during signing process" into main 2024-08-22 17:09:06 +00:00
Treehugger Robot
60f5f54e64 Merge "Add "TARGET_BOARD_PLATFORM" into soong_variables" into main 2024-08-22 05:43:38 +00:00
Wei Li
25b5c1c1b7 Merge "Use TARGET_OUT instead of TARGET_OUT_SYSTEM" into main 2024-08-22 00:40:32 +00:00
Kelvin Zhang
b707ea0206 Re-generate 4K boot OTAs using signed boot.img during signing process
Currently, dev option OTAs are generated using dev-key signed boot.img
On release-key devices, OTA will install successfully, but user would be
using dev-key signed boot image after reverting to 4K mode, and
subsequent OTAs would fail. This CL re-generates 4K boot OTA using
release-key signed boot.img , which allows normal OTAs after toggling
dev options.

Test: th
Bug: 354019928
Change-Id: I40811d6ed7a37f50edea77d245bf559b66da5a71
2024-08-21 10:36:57 -07:00
Hugo Drumond Jacob
9d42ae9a3d Merge "Revert "Add a coverage suffix to avoid Ninja file regeneration."" into main 2024-08-21 17:20:34 +00:00
Hugo Drumond Jacob
d69e11ee3c Revert "Add a coverage suffix to avoid Ninja file regeneration."
Revert submission 3207217-emma-flip-time-saver

Reason for revert: b/361236607

Reverted changes: /q/submissionid:3207217-emma-flip-time-saver

Change-Id: Id2e415232221baf2015b8170ceb64ee6f8d3f160
2024-08-21 13:07:09 +00:00
Jerome Gaillard
d93f559871 Merge "Add overlay files to layoutlib res.zip" into main 2024-08-21 08:56:09 +00:00
Herbert Xue
ad9d8e7169 Add "TARGET_BOARD_PLATFORM" into soong_variables
Bug: 360872208
Bug: 348120216
Test: aosp_cf_x86_64_phone-trunk_staging-eng && m hosttar
Change-Id: Ie5f630818c5bd538265a969abbb50f1fbe255f91
2024-08-21 13:00:21 +08:00
Treehugger Robot
cb56fa972b Merge "Don't pack target tests into art-host-tests.zip." into main 2024-08-20 17:14:47 +00:00
Treehugger Robot
f38c15ab8e Merge "make/core/Makefile: Skip images for local builds by default." into main 2024-08-20 16:48:51 +00:00
Jiakai Zhang
7731accb15 Don't pack target tests into art-host-tests.zip.
art-host-tests.mk packs target tests into art-host-tests.zip. This
behavior has been there since the very first version
(https://r.android.com/1437898).

Today, this behavior normally does nothing because target tests are
included in the ART testing apex and therefore not visible to Make.
However, if we remove any target tests from the ART testing apex, this
behavior will start to cause problems (b/360150490), as it will pack
those removed target tests into art-host-tests.zip and continous testing
will fail to run them.

This change removes this behavior.

Bug: 357802879
Bug: 169111770
Bug: 360150490
Test: `m art-host-tests` and see that the output is bit-identical with
  and without the change.
Change-Id: I2e9abdf4ed51bd8dc91637d7502350dfafb4aa39
2024-08-20 14:47:58 +00:00
Jerome Gaillard
c97c0b4a7c Add overlay files to layoutlib res.zip
This adds resource overlay files to the res.zip file created by
layoutlib_data.mk. This also updates the script generating the
corresponding SBOM file.

Bug: 335355919
Test: m layoutlib
Change-Id: I2427be23720324eb03bd428d220b8777e3bf49bb
2024-08-20 13:37:41 +01:00
Treehugger Robot
273f97b5a3 Merge "Add rbc version of soong_config_set_bool" into main 2024-08-20 01:32:07 +00:00
Qing Shen
ca2fe2cd81 Merge "Add a coverage suffix to avoid Ninja file regeneration." into main 2024-08-20 01:16:53 +00:00
Cole Faust
88eeea5b2e Add rbc version of soong_config_set_bool
Bug: 342006386
Test: go test
Change-Id: Icd885bc576715f650c02d7f4043e6ace8842f0da
2024-08-19 17:35:31 -07: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
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
1afb74365c Merge "Add trendy team for android media solutions playback" into main 2024-08-16 21:25:33 +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
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
Treehugger Robot
c8a5399192 Merge "Migrate ramdisk_node_list configuration to Android.bp" into main 2024-08-16 14:51:15 +00:00
Jooyung Han
113f1f5c7e Merge "Add /odm/apex/ support." into main 2024-08-16 03:46:57 +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
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
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
3e0319275f Merge "Fix build error while creating CHD image" into main 2024-08-14 19:15:32 +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
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
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
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
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
f55902f65f Merge "target-files: Support erofs_compress_hints" into main 2024-08-13 01:21:02 +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
832819e90d Merge "Remove setting init.userspace_reboot.is_supported" into main 2024-08-12 00:41:20 +00:00
Treehugger Robot
57ac3a18ea Merge "Build product/odm build.prop with Soong" into main 2024-08-12 00:08:32 +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