Commit Graph

100056 Commits

Author SHA1 Message Date
Qing Shen
4e47c08b5e Merge "Revert "Revert "Add a coverage suffix to avoid Ninja file regene..."" into main am: 1b8b8d23c4
Original change: https://android-review.googlesource.com/c/platform/build/+/3238688

Change-Id: I28f6ad173447a46c8bc13243279912e03244f72d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-23 23:25:13 +00:00
Qing Shen
1b8b8d23c4 Merge "Revert "Revert "Add a coverage suffix to avoid Ninja file regene..."" into main 2024-08-23 23:18:52 +00:00
Android Build Coastguard Worker
3d9c9aacdb Version bump to AP3A.240905.015.A2 [core/build_id.mk]
Change-Id: I3e2152d0e109ecc6c89c249dea678afc93faf62b
2024-08-23 21:29:41 +00:00
Qing Shen
6a8fff595b Revert "Revert "Add a coverage suffix to avoid Ninja file regene..."
Revert submission 3235973-revert-3207217-emma-flip-time-saver-BYWASVIMTD

Reason for revert: Rolling forward with a fix.

Also add coverage suffix for module-info.mk.

https://android-build.corp.google.com/builds/abtd/run/L52600030005977043 shows the failure: FAILED: ninja: 'out/soong/module-info-sdv_ivi_cf.json', needed by 'out/target/product/sdv_ivi_cf/module-info.json', missing and no known rule to make it

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

Change-Id: I0088fa18bf4d24a1c1d55389bd4a4b952ca2002b
TESTED: https://android-build.corp.google.com/builds/abtd/run/L00600030005992749
Bug: 331444846
2024-08-23 20:53:15 +00:00
Zhi Dou
c0c37bb742 Merge "Remove local copy of the flag file" into main am: 4fe368382d
Original change: https://android-review.googlesource.com/c/platform/build/+/3236943

Change-Id: Ie18ba103ed07e1ae4b3fa83fb9c555f9f82443f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-23 14:27:20 +00:00
Zhi Dou
4fe368382d Merge "Remove local copy of the flag file" into main 2024-08-23 14:23:31 +00:00
Zhi Dou
99023d6160 Remove local copy of the flag file
This change removes the local copy of the flag file in PackageTable, and
FlagValueList.

PackageTable copied the entire flag file into memory, and the
FlagValueList copied the entire flag value list into memory. In this
change FlagValueList directly access the flag value list in the memory.
PackageTable will iterate the file, and find the target package node.

Change-Id: Id766c28b71a54290b266cc5f3f404f5c82590da2
Test: atest aconfig_storage_file.test.java aconfig_storage_read_api.test.java
Bug: 352078117
2024-08-22 19:56:48 +00:00
Treehugger Robot
213b09e38a Merge "Fix problem of RepackApexPayload when using option --signing_args" into main am: 2f0d0b861b
Original change: https://android-review.googlesource.com/c/platform/build/+/3221018

Change-Id: Ic808716b0265425e19d0a71a9ef1f7c610655270
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 18:12:03 +00:00
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
f574cfe03c Merge "Re-generate 4K boot OTAs using signed boot.img during signing process" into main am: 939326d3be
Original change: https://android-review.googlesource.com/c/platform/build/+/3236656

Change-Id: Iddf44f50417927611bc9a7094da657c06a6f211f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 17:17:39 +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
Sangmin Lee
fd2e967af0 Optimize: Reduce vendor target build files
Prevent system/% files from being built by BUILDING_SYSTEM_IMAGE
and data/% files from being built by BUILDING_USERDATA_IMAGE

1) Address issue where system/% files were
being built even when
PRODUCT_BUILD_SYSTEM_IMAGE was false.
 This change reduces the ninja targets for
aosp_cf_x86_64_phone_vendor-trunk_staging-userdebug
from 140,427 to 57,303

Test:
lunch aosp_cf_x86_64_phone_vendor-trunk_staging-userdebug ; m

2) Resolve issue where data/% files were
being built during "m dist" even if
PRODUCT_BUILD_USERDATA_IMAGE was set to false

Test: Set any module to install at data partition using
LOCAL_MODULE_PATH=$(TARGET_OUT_DATA)/app
lunch aosp_cf_x86_64_phone_vendor-trunk_staging-userdebug ; m dist
Check the contents at out/target/product/vsoc_x86_64 and out/dist

Change-Id: I2a914339231d57598a6f30fc83fd8203d4107a11
2024-08-22 15:23:47 +09:00
Treehugger Robot
1def8d2f31 Merge "Add "TARGET_BOARD_PLATFORM" into soong_variables" into main am: 60f5f54e64
Original change: https://android-review.googlesource.com/c/platform/build/+/3235102

Change-Id: I8e0c4fcf6c52c5047807f2a79a9d3a6e7e69a2c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 05:48:55 +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
6c50877096 Merge "Use TARGET_OUT instead of TARGET_OUT_SYSTEM" into main am: 25b5c1c1b7
Original change: https://android-review.googlesource.com/c/platform/build/+/3219095

Change-Id: If78c96e30dea700d9bb30578f859846a4f2e6e3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 00:48:37 +00:00
Wei Li
25b5c1c1b7 Merge "Use TARGET_OUT instead of TARGET_OUT_SYSTEM" into main 2024-08-22 00:40:32 +00:00
Colin Cross
988bcf6dc2 Move checkbuild targets of Soong modules into Soong
Let Soong specify the files that will be built by checkbuild for
each Soong module.  This will give better control over which files
get built, allowing checkbuild to skip the jar combining step when
transitive classpath jars are enabled.

Bug: 308016794
Test: m checkbuild
Change-Id: Ic5140819381d58f4d00f23a7a12447950c4cf268
2024-08-21 10:53:35 -07: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
7c955bc371 Merge "Revert "Add a coverage suffix to avoid Ninja file regeneration."" into main am: 9d42ae9a3d
Original change: https://android-review.googlesource.com/c/platform/build/+/3235973

Change-Id: I0df29702941720436bb091087b734a5e23883ab5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-21 17:31:43 +00: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
b0a67ce2df Merge "Add overlay files to layoutlib res.zip" into main am: d93f559871
Original change: https://android-review.googlesource.com/c/platform/build/+/3228769

Change-Id: Ie112b2e3818b497a2feae30f83f3c15a704e21ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-21 09:02:23 +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
9ebd27ffcc Merge "Don't pack target tests into art-host-tests.zip." into main am: cb56fa972b
Original change: https://android-review.googlesource.com/c/platform/build/+/3232722

Change-Id: I35a32d11772af64517381b65564b849f50eecdd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-20 17:22:37 +00: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
0117ccddad Merge "make/core/Makefile: Skip images for local builds by default." into main am: f38c15ab8e
Original change: https://android-review.googlesource.com/c/platform/build/+/3211136

Change-Id: Ic6d952283a654d9de5c380dbf670e62f4bf242f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-20 17:05:39 +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
4a876883ff Merge "Add rbc version of soong_config_set_bool" into main am: 273f97b5a3
Original change: https://android-review.googlesource.com/c/platform/build/+/3229149

Change-Id: Ib0f6f2e65e9854b1cb9bfd346ed37e16793bea0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-20 01:37:26 +00: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
61ea5ce877 Merge "Add a coverage suffix to avoid Ninja file regeneration." into main am: ca2fe2cd81
Original change: https://android-review.googlesource.com/c/platform/build/+/3206456

Change-Id: I2a80cc6e4aa094fe35cb7529b7be483dc396e1a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-20 01:19:53 +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
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