Commit Graph

34524 Commits

Author SHA1 Message Date
Jeongik Cha
05210f96b3 BUILD_NUMBER and BUILD_HOSTNAME doesn't affect kati regeneration
* Extract BUILD_NUMBER, BUILD_HOSTNAME to file to avoid kati change
* Handle FILE_NAME_TAG_PLACEHOLDER string in dist in build/make/packaging/distdir.mk

Test: check if kati isn't invoked even though BUILD_NUMBER, BUILD_HOSTNAME
  is changed
Test: m && m, and check if the second m is no-op
Bug: 278060169
Change-Id: I1b37760242853c1a145bad255d0bb15524234b25
Merged-In: I1b37760242853c1a145bad255d0bb15524234b25
2023-05-23 07:14:22 +09:00
Liz Kammer
03bd5812e8 Add BUILD_BROKEN_PLUGIN_VALIDATION flag
Use is to specify the list of plugins are are not allowed.

Ignore-AOSP-First: Requires an internal only change to not break when submitted
Test: CI
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f24be9dba9b53b0c1682929253a3eba9af7a4c31)
Merged-In: Ia2fe83d82ead618e480e99a82b1b825ed08d3eab
Change-Id: Ia2fe83d82ead618e480e99a82b1b825ed08d3eab
2023-05-22 21:22:18 +00:00
Anton Hansson
cf253d7493 Merge "Don't add build ID to version name" am: 08b97147ac am: 9ef02252a6 am: 7c0628b3b8
Original change: https://android-review.googlesource.com/c/platform/build/+/2594246

Change-Id: I1524e96a2739246e3436a1e2d1e292d97eebbb79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 19:44:56 +00:00
Anton Hansson
7c0628b3b8 Merge "Don't add build ID to version name" am: 08b97147ac am: 9ef02252a6
Original change: https://android-review.googlesource.com/c/platform/build/+/2594246

Change-Id: I9c380b5cbd82065f5e23cf6ce329c74118a0e5e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 18:56:07 +00:00
Anton Hansson
9ef02252a6 Merge "Don't add build ID to version name" am: 08b97147ac
Original change: https://android-review.googlesource.com/c/platform/build/+/2594246

Change-Id: I601913fd85a87ffebc248845bc77a4ecbd78c66c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 18:16:39 +00:00
Anton Hansson
08b97147ac Merge "Don't add build ID to version name" 2023-05-22 17:43:10 +00:00
Matthew Sedam
2ad1c6402a Merge "Fix small spelling error in build/core/main.mk" am: d104c386f6 am: cfc47399f1 am: a9ba4d2aac
Original change: https://android-review.googlesource.com/c/platform/build/+/2597518

Change-Id: I7b834b4b2eaa3b58d1ca4379a983944d711940c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 17:38:16 +00:00
Satoshi Futenma
792dfa537a Add merge_ota to otatools
Bug: 282189563
Test: manual, m otatools-package, confirm that merga_ota is
    present in otatools.zip
(cherry picked from https://android-review.googlesource.com/q/commit:6d56d45f96cc1f4e45141bfd04cd92551451d3f5)
Merged-In: I40c3866bfb016aa1dec1c6dc2d95c66deb1e61ea
Change-Id: I40c3866bfb016aa1dec1c6dc2d95c66deb1e61ea
2023-05-22 17:31:49 +00:00
Matthew Sedam
a9ba4d2aac Merge "Fix small spelling error in build/core/main.mk" am: d104c386f6 am: cfc47399f1
Original change: https://android-review.googlesource.com/c/platform/build/+/2597518

Change-Id: Ib188aff36830eb29cb53c71660b1a07a2bfecca3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 16:42:04 +00:00
Matthew Sedam
cfc47399f1 Merge "Fix small spelling error in build/core/main.mk" am: d104c386f6
Original change: https://android-review.googlesource.com/c/platform/build/+/2597518

Change-Id: I85adc59cbb50530251748c17a3c2a64604e85bb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 16:14:07 +00:00
Matthew Sedam
d104c386f6 Merge "Fix small spelling error in build/core/main.mk" 2023-05-22 15:45:43 +00:00
Jeongik Cha
5283549e42 Merge "Introduce dist-for-goals-with-filenametag" am: 07cfdab76a am: 1622541b05 am: f75b936fd1
Original change: https://android-review.googlesource.com/c/platform/build/+/2567250

Change-Id: Ie245028a08325b575f3b3ea2ac4aef3a0a19c423
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 03:51:56 +00:00
Jeongik Cha
f75b936fd1 Merge "Introduce dist-for-goals-with-filenametag" am: 07cfdab76a am: 1622541b05
Original change: https://android-review.googlesource.com/c/platform/build/+/2567250

Change-Id: I06b1e156c5d3fe952337863872e493e978bc1928
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 03:25:38 +00:00
Jeongik Cha
1622541b05 Merge "Introduce dist-for-goals-with-filenametag" am: 07cfdab76a
Original change: https://android-review.googlesource.com/c/platform/build/+/2567250

Change-Id: Ie697682a5c01c8c25db6f9eba58848f8d3fa2d8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 03:00:16 +00:00
Jeongik Cha
07cfdab76a Merge "Introduce dist-for-goals-with-filenametag" 2023-05-22 02:25:45 +00:00
Joe Onorato
a5ab48113a Merge "Revert "Define release flags in starlark instead of make"" am: 2f1f4c25f7 am: f54a552cc5 am: 87d0ddc115
Original change: https://android-review.googlesource.com/c/platform/build/+/2595631

Change-Id: I8d3d7466b916cd98a58e17dcfe5d9b47f5798068
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-20 03:10:00 +00:00
Joe Onorato
87d0ddc115 Merge "Revert "Define release flags in starlark instead of make"" am: 2f1f4c25f7 am: f54a552cc5
Original change: https://android-review.googlesource.com/c/platform/build/+/2595631

Change-Id: Iac619d584c63af116ec490d4707b3912c46051a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-20 02:46:40 +00:00
Joe Onorato
f54a552cc5 Merge "Revert "Define release flags in starlark instead of make"" am: 2f1f4c25f7
Original change: https://android-review.googlesource.com/c/platform/build/+/2595631

Change-Id: I0d7ebe8a487ee1699268fc14d618614855079c54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-20 02:22:50 +00:00
Joe Onorato
2f1f4c25f7 Merge "Revert "Define release flags in starlark instead of make"" 2023-05-20 01:52:53 +00:00
Treehugger Robot
562fabb016 Merge "16k: Add 16K variant kernel/ramdisk build targets" am: c179330edb am: 233236fa17 am: 4552dd8a21
Original change: https://android-review.googlesource.com/c/platform/build/+/2595672

Change-Id: I21aa0bd8ff51d4ecee87d4ec4172ec25384d3f5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-20 01:09:48 +00:00
Treehugger Robot
4552dd8a21 Merge "16k: Add 16K variant kernel/ramdisk build targets" am: c179330edb am: 233236fa17
Original change: https://android-review.googlesource.com/c/platform/build/+/2595672

Change-Id: If6ae27053c6866ef9404e3546712b63085d070fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-20 00:46:04 +00:00
Treehugger Robot
233236fa17 Merge "16k: Add 16K variant kernel/ramdisk build targets" am: c179330edb
Original change: https://android-review.googlesource.com/c/platform/build/+/2595672

Change-Id: Ib67f680d06d79b0946430fe6d686baf260b0a528
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-20 00:22:26 +00:00
Kelvin Zhang
3e067dc7b8 Merge "Revert "16k: Add 16K variant kernel/ramdisk build targets"" am: 863cba2c1d am: f6da3925e4 am: 16edf2b59f
Original change: https://android-review.googlesource.com/c/platform/build/+/2598005

Change-Id: Id4ec6176a3a714878dce5fa8bf055e602bca8af6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 22:22:22 +00:00
Kelvin Zhang
16edf2b59f Merge "Revert "16k: Add 16K variant kernel/ramdisk build targets"" am: 863cba2c1d am: f6da3925e4
Original change: https://android-review.googlesource.com/c/platform/build/+/2598005

Change-Id: I8df285bdd028de1448d0b9b702d2eb7c4755f0ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 21:35:27 +00:00
Kelvin Zhang
decee4adb7 Add 16K artifacts to PREBUILT_IMAGES/ dir of target_files
Test: th
Bug: 283506035
Change-Id: I9be3982b5a4324ec839937d10c33266c7d27c525
2023-05-19 14:31:00 -07:00
Matthew Sedam
fb861d6ba6 Fix small spelling error in build/core/main.mk
Bug: N/A
Change-Id: I858fb4b23a1c85035c59c42d8e3260fd376f941c
Test: N/A
2023-05-19 20:58:16 +00:00
Kelvin Zhang
f6da3925e4 Merge "Revert "16k: Add 16K variant kernel/ramdisk build targets"" am: 863cba2c1d
Original change: https://android-review.googlesource.com/c/platform/build/+/2598005

Change-Id: I0ed2a96b9ebffbed69908072ec852b0865513a61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 20:51:23 +00:00
Kelvin Zhang
d8eac1cb9a 16k: Add 16K variant kernel/ramdisk build targets
This adds two new build variables, BOARD_KERNEL_PATH_16K and
BOARD_KERNEL_MODULES_16K . BOARD_KERNEL_PATH_16K will be copied
to output directory as is.

BOARD_KERNEL_MODULES_16K is a list of modules which will be packed into a
ramdisk and added to output dir. This allows cuttlefish to switch to 16K
kernel at runtime without adding too much overhead, as ramdisk building
takes very little time.

Bug: 253827893
Test: m kernel_16k ramdisk_16k

Change-Id: Ibb36ba4c3399b3f193795aea6597a4aa535f1bec
2023-05-19 13:08:52 -07:00
Kelvin Zhang
863cba2c1d Merge "Revert "16k: Add 16K variant kernel/ramdisk build targets"" 2023-05-19 20:05:00 +00:00
Kelvin Zhang
6572bee96b Revert "16k: Add 16K variant kernel/ramdisk build targets"
This reverts commit 1f04dfaba2.

Reason for revert: breaks build on ab/10170403

Change-Id: I92e064ab07b02e4f17a22b113032eaa4d9f131cc
2023-05-19 20:03:19 +00:00
Joe Onorato
7b578d32f9 Revert "Define release flags in starlark instead of make"
This reverts commit c113a70221.

Doesn't work with OUT_DIR hard coded outside the tree.

Test: OUT_DIR=/source/whatever m
Bug: 283278495
Change-Id: I8cc74a9ec936b9c7502b97b9b7a4fd731988c407
2023-05-19 09:22:42 -07:00
Kelvin Zhang
704946ce3b Merge "16k: Add 16K variant kernel/ramdisk build targets" am: ab9fb56784 am: 19020dc0ef am: b8c7fe4cea
Original change: https://android-review.googlesource.com/c/platform/build/+/2593545

Change-Id: I9e2652d58f7d7087bc8ef72d9738bf814f7970dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 02:07:52 +00:00
Kelvin Zhang
b8c7fe4cea Merge "16k: Add 16K variant kernel/ramdisk build targets" am: ab9fb56784 am: 19020dc0ef
Original change: https://android-review.googlesource.com/c/platform/build/+/2593545

Change-Id: Ic9244204a878341bb8652f7a11c9277d6a285c75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 01:23:30 +00:00
Kelvin Zhang
19020dc0ef Merge "16k: Add 16K variant kernel/ramdisk build targets" am: ab9fb56784
Original change: https://android-review.googlesource.com/c/platform/build/+/2593545

Change-Id: I4dd6845d8c3a193b23ff74d51418b910cefc9cc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 00:41:37 +00:00
Wei Li
233d5b97f8 Some changes to support SBOM generation for b build unbundled APEXs.
1) Use output file path of installed files in build system since there is no PRODUCT_OUT in Bazel
2) Use CONTAINS to describe the relationship between a APEX and files it contains
3) Generate SBOM of APEXs, which is similar to SBOM of products

Bug: 275472038
Test: CIs
(cherry picked from https://android-review.googlesource.com/q/commit:fd7e6517d345d3b8d4af12dae345434d968b83b9)
Merged-In: I41622366e5e6ed9dc78cca7bc7bb69a1f8f9bd9f
Change-Id: I41622366e5e6ed9dc78cca7bc7bb69a1f8f9bd9f
2023-05-19 00:35:20 +00:00
Wei Li
d637b06d8f Export some make variables to soong.variables.
Bug: 275472038
Test: CIs
(cherry picked from https://android-review.googlesource.com/q/commit:996830047f79a5b9e9c9ed590886217068d9576e)
Merged-In: I2e7a07007224364418659453d979e2bee58fe5f9
Change-Id: I2e7a07007224364418659453d979e2bee58fe5f9
2023-05-19 00:35:09 +00:00
Kelvin Zhang
ab9fb56784 Merge "16k: Add 16K variant kernel/ramdisk build targets" 2023-05-19 00:00:32 +00:00
Kelvin Zhang
1f04dfaba2 16k: Add 16K variant kernel/ramdisk build targets
This adds two new build variables, BOARD_KERNEL_PATH_16K and
BOARD_KERNEL_MODULES_16K . BOARD_KERNEL_PATH_16K will be copied
to output directory as is.

BOARD_KERNEL_MODULES_16K is a list of modules which will be packed into a
ramdisk and added to output dir. This allows cuttlefish to switch to 16K
kernel at runtime without adding too much overhead, as ramdisk building
takes very little time.

Bug: 253827893
Test: m kernel_16k ramdisk_16k
Change-Id: I4e49c727e5ed07a915145897cb987f29b0fe68e2
2023-05-18 20:12:09 +00:00
Liz Kammer
bc4f48c415 Add BUILD_BROKEN_PLUGIN_VALIDATION flag
Use is to specify the list of plugins are are not allowed.

Ignore-AOSP-First: Requires an internal only change to not break when submitted
Test: CI
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f24be9dba9b53b0c1682929253a3eba9af7a4c31)
Merged-In: Ia2fe83d82ead618e480e99a82b1b825ed08d3eab
Change-Id: Ia2fe83d82ead618e480e99a82b1b825ed08d3eab
2023-05-18 18:20:22 +00:00
Android Build Coastguard Worker
e88b8f4552 Version bump to TQ3A.230605.011 [core/build_id.mk]
Change-Id: Ic8c06bc6c6441445a202c7451cb242956df30612
2023-05-18 16:25:38 +00:00
Treehugger Robot
c1542959c4 Merge "Don't build automatic RROs for tests" am: 4d4ffb28f4 am: f18046a759
Original change: https://android-review.googlesource.com/c/platform/build/+/2595526

Change-Id: Ifac6f44fa90acee2dc61aca822bfc26af2194c3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 08:26:50 +00:00
Treehugger Robot
b80ad7d3cf Merge "Define release flags in starlark instead of make" am: cedf6314bc am: b0845d7c4d am: dc1fef95d9
Original change: https://android-review.googlesource.com/c/platform/build/+/2585846

Change-Id: Ic64811d76b201fc79d2beab20faef41b52069c00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 08:02:58 +00:00
Treehugger Robot
f18046a759 Merge "Don't build automatic RROs for tests" am: 4d4ffb28f4
Original change: https://android-review.googlesource.com/c/platform/build/+/2595526

Change-Id: I8498d7585e61ac82da96a2c9f7dc75758f714438
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 07:43:14 +00:00
Treehugger Robot
dc1fef95d9 Merge "Define release flags in starlark instead of make" am: cedf6314bc am: b0845d7c4d
Original change: https://android-review.googlesource.com/c/platform/build/+/2585846

Change-Id: I38b4132605a7028be492ca8fa48c875049c4d521
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 07:20:49 +00:00
Treehugger Robot
4d4ffb28f4 Merge "Don't build automatic RROs for tests" 2023-05-18 06:59:24 +00:00
Treehugger Robot
b0845d7c4d Merge "Define release flags in starlark instead of make" am: cedf6314bc
Original change: https://android-review.googlesource.com/c/platform/build/+/2585846

Change-Id: Ibef1aad9331f1dd65ec5a2ebeb27296e8b94abb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 06:16:16 +00:00
Treehugger Robot
cedf6314bc Merge "Define release flags in starlark instead of make" 2023-05-18 05:22:47 +00:00
Colin Cross
3a84a84044 Merge "Build java fuzz targets with one build target instead of needed a host target and device" am: ede2d8e2ec am: 86c4177294
Original change: https://android-review.googlesource.com/c/platform/build/+/2593446

Change-Id: I3e69f2f6d157599e68a9d26633cfbf42d5c9da4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 04:25:25 +00:00
Colin Cross
86c4177294 Merge "Build java fuzz targets with one build target instead of needed a host target and device" am: ede2d8e2ec
Original change: https://android-review.googlesource.com/c/platform/build/+/2593446

Change-Id: I62801a11f9005090ebfd9866985a87cd6d220f71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 03:41:19 +00:00
Colin Cross
93ff702df2 Don't build automatic RROs for tests
Automatic RROs don't make sense for tests, the tests can't rely on
overlays being installed on product or vendor.  Creating the RROs
causes a race during builds that build both droid and device-tests
goals, as the RROs may be installed to the vendor directory as a
dependency of the device-tests goal before or after the vendor image
is packaged as a dependency of the droid goal.  If the RROs are
installed first and the vendor image is low on space it may result
in an out-of-space error.

Bug: 282885159
Test: Rule to build $OUT/vendor/overlay/SystemUITests__*__auto_generated_rro_vendor.apk no longer exists
Change-Id: I760355ffb1818e91c02a98473312f9f21c149361
Merged-In: I760355ffb1818e91c02a98473312f9f21c149361
2023-05-18 03:14:01 +00:00