Commit Graph

99868 Commits

Author SHA1 Message Date
Jae Hoon Kim
766a3487ef Merge "core/Makefile: Add desktop update image target hook" into main am: 2366366e9f
Original change: https://android-review.googlesource.com/c/platform/build/+/3241411

Change-Id: I3f3242e276f55499e408f983484b7578dc1b9dd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-27 22:31:41 +00:00
Jae Hoon Kim
2366366e9f Merge "core/Makefile: Add desktop update image target hook" into main 2024-08-27 22:29:46 +00:00
Jae Hoon Kim
c6a9897f88 core/Makefile: Add desktop update image target hook
.. allowing for targets to trigger update image builds.

Bug: b:357929709
Test: m dist
Flag: EXEMPT desktop only change
Change-Id: I66d4a76daf7b163df60d94c4ba30bb377674b84f
2024-08-27 20:15:57 +00:00
Pindar Yang
9f837db707 Merge "Revert "Export variable to soong for converting vintf_compatibil..."" into main am: da0dfeb705
Original change: https://android-review.googlesource.com/c/platform/build/+/3235657

Change-Id: I9088349709d41a06309b4f3ce5e41bc07bd50e8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-27 03:33:33 +00:00
Pindar Yang
da0dfeb705 Merge "Revert "Export variable to soong for converting vintf_compatibil..."" into main 2024-08-27 03:25:23 +00:00
Pindar Yang
1c8d6ea6f8 Revert "Export variable to soong for converting vintf_compatibil..."
Revert submission 3195743-compatibility_matrix

Reason for revert: Build Break, Bug: 361227456

Reverted changes: /q/submissionid:3195743-compatibility_matrix

Change-Id: I7dc43c32d3ada03fd319f47892049b5f33cfcfb4
2024-08-27 03:23:40 +00:00
Spandan Das
259692c6f3 Merge "Remove some files from packaging allowlist" into main am: 03b680d4ba
Original change: https://android-review.googlesource.com/c/platform/build/+/3241405

Change-Id: I7b3ac632a4eabc19702c5d9460ec7d6ca3606fdf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-26 23:29:20 +00:00
Spandan Das
03b680d4ba Merge "Remove some files from packaging allowlist" into main 2024-08-26 23:26:10 +00:00
Luca Farsi
f8561c60a7 Merge "add BuildContext class and fix enabled features" into main am: b2c2fe8856
Original change: https://android-review.googlesource.com/c/platform/build/+/3236364

Change-Id: I8a0f8474a1a206da0cbbae60fe2fd6fb635cdd0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-26 21:30:06 +00:00
Spandan Das
0e695737e4 Remove some files from packaging allowlist
These files are symlinks. With https://r.android.com/3200722, these
should be available in the soong built system image.

Test: presubmits
Change-Id: I4acb05ed8498dc8b7aac76e4c91b9173ed3d6574
2024-08-26 21:29:24 +00:00
Luca Farsi
b2c2fe8856 Merge "add BuildContext class and fix enabled features" into main 2024-08-26 21:21:30 +00:00
Treehugger Robot
61fc11ac5a Merge "Optimize: Reduce vendor target build files" into main am: 95feb949e1
Original change: https://android-review.googlesource.com/c/platform/build/+/3235583

Change-Id: I255a2d9269d384da754fe0559ba5fd55f78a9016
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-26 21:13:53 +00:00
Treehugger Robot
95feb949e1 Merge "Optimize: Reduce vendor target build files" into main 2024-08-26 21:11:21 +00:00
Luca Farsi
b130e791b6 add BuildContext class and fix enabled features
Add a BuildContext class to simplify parsing the build context dict, and
fix the parsing of enabledBuildFeatures, which was being parsed as a
list of strings when it's actually a list of dicts like:
[{'name': '<feature_name>'}]

Test: atest build_test_suites_test
Bug: 361605425
Change-Id: I6424c444daf1582e92313c39f43207cb274aa78f
2024-08-26 12:26:48 -07:00
Treehugger Robot
17874e0299 Merge "Revert "Fix problem of RepackApexPayload when using option --signing_args"" into main am: 1dbf5fb045
Original change: https://android-review.googlesource.com/c/platform/build/+/3242201

Change-Id: Id9e9606fd5f01c47a281a7aba6b056dcd394d90b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-26 16:55:57 +00:00
Treehugger Robot
1dbf5fb045 Merge "Revert "Fix problem of RepackApexPayload when using option --signing_args"" into main 2024-08-26 16:47:43 +00:00
Aaron Homer
58992a6052 Revert "Fix problem of RepackApexPayload when using option --signing_args"
This reverts commit 5ebc4febe6.

Reason for revert: This is causing the signing args to be improperly passed to apexer, treating them as if they are not specified as all.

Change-Id: Ifa0f8444a4a1871802316511b0ff0735f3350b2c
Bug: 361784913
2024-08-26 15:21:26 +00:00
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
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
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