Commit Graph

38104 Commits

Author SHA1 Message Date
Kelvin Zhang
8948d13afc Add boot_16k.img and dtbo_16k.img to target_files
During signing, we need to re-generate dev option OTAs, as the 4K boot
images are getting signed with a different key. To allow generating
incremental OTAs for boot OTAs, include 16K variant of the boot images.

Test: th
Bug: 339658378
Change-Id: I0aafd5f48dbefeb2b86fd8bd93f6ce4d3f28a3cd
2024-08-29 13:38:45 -07:00
Herbert Xue
3e3cbeb3a5 Move COMPATIBILITY.tradefed_tests_dir to proper place
Bug: 341873065
Test: presubmit
Change-Id: Ibd99b07b8548eafb72254fda2a248b9ec32ee8ef
2024-08-29 14:46:50 +08:00
Android Build Coastguard Worker
fac305600c Version bump to AP4A.240829.002 [core/build_id.mk]
Change-Id: Ib1ae45c49a706d49ec3c4391d2ab1ba55283d845
2024-08-29 02:50:00 +00:00
Android Build Coastguard Worker
65292afc14 Make change and version bump to AP4A.240829.001
Snap for 12289667 from 4279d6b731 to 24Q4-release

Change-Id: Id715c8c52e45c6458350570df5b6f00a6fa31126
2024-08-28 23:44:23 +00:00
Joe Onorato
248580cb41 Add the list of makefiles that were also included by product config to dumpconfig.
In this entry, the first list of files is the inherit-product stack, and
the second one is the list of files included by the file at the top of
the stack that just finished processing

Test: build/make/ci/dump_product_config
Change-Id: I826b1ec6fa1319b8f0cdfaacc6ccf999ce93d9f1
2024-08-28 20:21:31 +00:00
Joe Onorato
6dfeb795e0 Add tracing for board config to dumpconfig
Test: build/make/ci/dump_product_config
Change-Id: I0667ef0e4427d396cedb03eaf2a314a789947e98
2024-08-28 20:21:31 +00:00
Joe Onorato
b34578cf74 Fix newline for dumpconfig
Test: build/make/ci/dump_product_config
Change-Id: Ie4481513b58f589a00b092114135788b1c4c62cd
2024-08-28 20:21:31 +00:00
Android Build Coastguard Worker
e44587cf2f Version bump to AP4A.240828.003 [core/build_id.mk]
Change-Id: I04b773d6e209a31c8443959fa98ab674074b6185
2024-08-28 17:41:48 +00:00
Nelson Li
3114519c89 Add a new Soong config variable EMMA_INSTRUMENT
This change introduces a new Soong config variable named
`EMMA_INSTRUMENT`. This variable mirrors the behavior of the existing
`EMMA_INSTRUMENT` condition in Android.mk files, allowing for
conditional build configurations based on whether EMMA instrumentation
is enabled.

Bug: 342330305
Test: 1) EMMA_INSTRUMENT=true m ahat-tests
      2) m -j ahat-tests
Change-Id: I7bc28cd3de936d1e6bfb218683bcf07b40e80784
2024-08-28 11:55:21 +00:00
Inseob Kim
4f3edc1a7d Merge "Include TARGET_ODM_PROP to odm/etc/build.prop" into main am: 58ef2deebf am: 8774b552b8
Original change: https://android-review.googlesource.com/c/platform/build/+/3237921

Change-Id: I4680715525c7296294a9907285a95de738981230
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-28 00:27:34 +00:00
Inseob Kim
8774b552b8 Merge "Include TARGET_ODM_PROP to odm/etc/build.prop" into main am: 58ef2deebf
Original change: https://android-review.googlesource.com/c/platform/build/+/3237921

Change-Id: Ie7b8b148c02758df3cf12995a98395a141cbc76f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-28 00:20:56 +00:00
Android Build Coastguard Worker
854d329849 Version bump to AP4A.240828.002 [core/build_id.mk]
Change-Id: I632cd30f5c808f21ba0c7a6840d37775cd342c6e
2024-08-28 00:17:05 +00:00
Inseob Kim
58ef2deebf Merge "Include TARGET_ODM_PROP to odm/etc/build.prop" into main 2024-08-28 00:15:14 +00:00
Android Build Coastguard Worker
f64af452f0 Make change and version bump to AP4A.240828.001
Snap for 12283639 from 4586480c30 to 24Q4-release

Change-Id: I9d6e26af18c0f779700bfd95b5bac8627ca0081c
2024-08-27 23:44:24 +00:00
Android Build Coastguard Worker
bbb1b5a018 Version bump to AP4A.240827.002 [core/build_id.mk]
Change-Id: I68b2ab1e64726fd37c67f83a6fa03d62e7d394f2
2024-08-27 22:49:17 +00:00
Jae Hoon Kim
7df944ee21 Merge "core/Makefile: Add desktop update image target hook" into main am: 2366366e9f am: 766a3487ef
Original change: https://android-review.googlesource.com/c/platform/build/+/3241411

Change-Id: I24ba814d96b6b5aed2f71f09ff791358f8981ec9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-27 22:40:01 +00:00
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