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
4586480c30
Merge "Revert "Export variable to soong for converting vintf_compatibil..."" into main am: da0dfeb705
am: 9f837db707
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3235657
Change-Id: I44f16da9b78e3a94bacaff413798d9f51a5b1570
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-27 03:41:31 +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
Android Build Coastguard Worker
99043cd9f0
Make change and version bump to AP4A.240827.001
...
Snap for 12278291 from b0b79f838e
to 24Q4-release
Change-Id: I73bf2564e8c08e9d599d4a7b1397270b596edfce
2024-08-26 23:43:48 +00:00
Treehugger Robot
903134d00f
Merge "Optimize: Reduce vendor target build files" into main am: 95feb949e1
am: 61fc11ac5a
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3235583
Change-Id: Ia0430c01378dd8e2c5ce742bd3d713f40c0636bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-26 21:20:07 +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
Inseob Kim
9e6cf672d9
Include TARGET_ODM_PROP to odm/etc/build.prop
...
It's missing in Soong's build_prop module.
Bug: 322090587
Bug: 361623560
Test: set TARGET_ODM_PROP and see odm/etc/build.prop
Change-Id: I670081bbe0addc8fed0b7c04ae560ef830cbfecf
2024-08-26 15:56:45 +09:00
Android Build Coastguard Worker
ed85c9de4d
Make change and version bump to AP4A.240826.001
...
Snap for 12274519 from c0d11633cd
to 24Q4-release
Change-Id: I2155ff018b050baa2213f3143d4a2aec72e9cb13
2024-08-25 21:44:37 +00:00
Android Build Coastguard Worker
c9307d7c9f
Make change and version bump to AP4A.240825.001
...
Snap for 12273892 from c0d11633cd
to 24Q4-release
Change-Id: I94e5c34412bf1f7d02917681dc026e85f0222486
2024-08-24 21:44:06 +00:00
Android Build Coastguard Worker
3808500900
Make change and version bump to AP4A.240824.001
...
Snap for 12272146 from 3b8df957d8
to 24Q4-release
Change-Id: I6dbdfb61276dcb68c35ed74a766fddae834f9ba4
2024-08-24 01:43:28 +00:00
Qing Shen
c0d11633cd
Merge "Revert "Revert "Add a coverage suffix to avoid Ninja file regene..."" into main am: 1b8b8d23c4
am: 4e47c08b5e
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3238688
Change-Id: Ib9bb0fe27fd9c8161dc46821c8c6375d1b3627eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-23 23:34:28 +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
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
Android Build Coastguard Worker
0cf46c6d10
Version bump to AP4A.240823.002 [core/build_id.mk]
...
Change-Id: I2851de4d01022980e25bf75cf51544151a197ea6
2024-08-23 01:11:36 +00:00
Android Build Coastguard Worker
793444cae4
Make change and version bump to AP4A.240823.001
...
Snap for 12265118 from 1cb5415d27
to 24Q4-release
Change-Id: Icbc171f5db13ce1c1afd5bc20d6cd1a447f53d49
2024-08-22 23:44:24 +00:00
Android Build Coastguard Worker
f3ad1bf59a
Version bump to AP4A.240822.002 [core/build_id.mk]
...
Change-Id: I1b17d16119b1190c9625e7db52af9762204031ad
2024-08-22 19:03:20 +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
1cb5415d27
Merge "Add "TARGET_BOARD_PLATFORM" into soong_variables" into main am: 60f5f54e64
am: 1def8d2f31
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3235102
Change-Id: I0323cdf13654ee8281d53e7fc98121b23859e58c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-22 05:56:28 +00: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
026b95cb0f
Merge "Use TARGET_OUT instead of TARGET_OUT_SYSTEM" into main am: 25b5c1c1b7
am: 6c50877096
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3219095
Change-Id: Ia9a102564c39e2aa43628f2bf0ef9e6991ed3dce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-22 00:55:53 +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
Android Build Coastguard Worker
78489338d6
Make change and version bump to AP4A.240822.001
...
Snap for 12260156 from 8ac4fba6ab
to 24Q4-release
Change-Id: I143518c4edd72b730f745460f32d1be29d9363dc
2024-08-21 23:43:49 +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
Hugo Drumond Jacob
8ac4fba6ab
Merge "Revert "Add a coverage suffix to avoid Ninja file regeneration."" into main am: 9d42ae9a3d
am: 7c955bc371
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3235973
Change-Id: Ic5a24a0db1b1fe3e850c3c00e6e53bdbffd8230f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-21 17:38:04 +00: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
bf87744078
Merge "Add overlay files to layoutlib res.zip" into main am: d93f559871
am: b0a67ce2df
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3228769
Change-Id: I5c1b10f0424a4b4727792e80e90a591426c4be36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-21 09:07:55 +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
Android Build Coastguard Worker
bae4c879f8
Make change and version bump to AP4A.240821.001
...
Snap for 12253386 from a6488974f6
to 24Q4-release
Change-Id: I80248e1deb68685ac0ead97ca78b9c1324992a15
2024-08-20 23:44:10 +00:00
Treehugger Robot
bfbe6ce4a1
Merge "Don't pack target tests into art-host-tests.zip." into main am: cb56fa972b
am: 9ebd27ffcc
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3232722
Change-Id: I98d2cf4de9cb9c80281e0c4d3842c08f5bb3cac9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-20 21:50:26 +00:00
Treehugger Robot
9f3fd5b5a8
Merge "make/core/Makefile: Skip images for local builds by default." into main am: f38c15ab8e
am: 0117ccddad
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3211136
Change-Id: I43bf5f610e2df364d9b52efff4cc6768d03c78cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-20 21:47:45 +00:00
Treehugger Robot
7d540014cc
Merge "Add rbc version of soong_config_set_bool" into main am: 273f97b5a3
am: 4a876883ff
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3229149
Change-Id: Ied2dd9c5c50a6029f2552a454c7f91ca2c2bd67f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-20 21:46:34 +00:00
Qing Shen
9f0471dd15
Merge "Add a coverage suffix to avoid Ninja file regeneration." into main am: ca2fe2cd81
am: 61ea5ce877
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3206456
Change-Id: Id76c9428d9897bc1fda8bb8a0f743315caeea40b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-20 21:46:14 +00: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