StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
99,898 Commits 1 Branch 0 Tags
d0b36a410f0a7b0acf7e022ffa180ae6b081f59c
Commit Graph

37790 Commits

Author SHA1 Message Date
Treehugger Robot
d0b36a410f Merge "Add boot_16k.img and dtbo_16k.img to target_files" into main am: 2091dc30e2 
Original change: https://android-review.googlesource.com/c/platform/build/+/3236458

Change-Id: I1f4d2c41546df89e37af0085fb755f79981752f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-29 23:28:59 +00:00
Treehugger Robot
2091dc30e2 Merge "Add boot_16k.img and dtbo_16k.img to target_files" into main 2024-08-29 23:26:15 +00:00
Cole Faust
3c9e58c565 Merge changes I826b1ec6,I0667ef0e,Ie4481513 into main am: da669fa5f0 
Original change: https://android-review.googlesource.com/c/platform/build/+/3247886

Change-Id: I499de7eb93d7399ae10b81918295838bb6e9505d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-29 22:14:19 +00:00
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
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
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
Inseob Kim
58ef2deebf Merge "Include TARGET_ODM_PROP to odm/etc/build.prop" into main 2024-08-28 00:15:14 +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
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
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
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
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
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
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
Treehugger Robot
1d4cfd945e Merge "Migrate ramdisk_node_list configuration to Android.bp" into main am: c8a5399192 
Original change: https://android-review.googlesource.com/c/platform/build/+/3217721

Change-Id: I46e84cd3231535fb80e529ec2f2e73bfeb323bf6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-16 15:08: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
f5d16e0a60 Merge "Add /odm/apex/ support." into main am: 113f1f5c7e 
Original change: https://android-review.googlesource.com/c/platform/build/+/3217178

Change-Id: I4bfb322b0bb7ae1a605f1a98dc3d32048aefb5a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-16 04:00:29 +00:00
Jooyung Han
113f1f5c7e Merge "Add /odm/apex/ support." into main 2024-08-16 03:46:57 +00:00
Treehugger Robot
4444476447 Merge "Export variable to soong for converting vintf_compatibility_matrix" into main am: 00378b193d 
Original change: https://android-review.googlesource.com/c/platform/build/+/3195839

Change-Id: Ifb6f5a83399a69e9798a5026901d32aa2c05e303
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-15 09:35:44 +00: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