StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
84,858 Commits 1 Branch 0 Tags
d0b037235d5fb4a9e4ff8dc6f4795d8076e912ae
Commit Graph

84858 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeongik Cha
d0b037235d 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

Ignore-AOSP-First: there are internal use cases of FILE_NAME_TAG
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
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:7b40aa8338ba85a58ee481fe6bafac2959f7112b)
Merged-In: I1b37760242853c1a145bad255d0bb15524234b25
Change-Id: I1b37760242853c1a145bad255d0bb15524234b25
 2023-05-22 22:42:07 +00: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
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
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
Treehugger Robot
90ea531bb2 Merge changes from topic "aconfig-stable-flag-order" am: f469fd6cc6 am: 1ad09e0bfa 
Original change: https://android-review.googlesource.com/c/platform/build/+/2595206

Change-Id: I9e812cef63f8786585db3154626f76ab1d1d5f64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-22 12:56:59 +00:00
Treehugger Robot
1ad09e0bfa Merge changes from topic "aconfig-stable-flag-order" am: f469fd6cc6 
Original change: https://android-review.googlesource.com/c/platform/build/+/2595206

Change-Id: Ic66ea4047487b6f8c4c51237bf583d035b7032d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-22 12:30:11 +00:00
Treehugger Robot
f469fd6cc6 Merge changes from topic "aconfig-stable-flag-order" 
* changes:
  aconfig: sort items in cache by name
  aconfig: dump: support multiple caches
 2023-05-22 12:15:06 +00:00
Mårten Kongstad
2f95444281 aconfig: sort items in cache by name 
Introduce a builder pattern for constructing a cache from flag
declarations and flag values. Teach the builder to sort the flags by
name as the last step. This will ensure consistent dump output
regardless of the order flags are specified in the input files.

Bug: 279485059
Test: atest aconfig.test
Change-Id: Icdd62f51fa3761a469663f17581a83d9909e9ffe
 2023-05-22 10:01:05 +02:00
Mårten Kongstad
af677038b3 aconfig: dump: support multiple caches 
Teach `aconfig dump` to read multiple caches at the same time.

A cache represents a single namespace, and the Android build creates
multiple caches for different namespaces. By passing in all those cache
files to `aconfig dump`, aconfig will create a complete overview of all
flags in the Android tree.

Caches are traversed in order of namespace to produce the same output
regardless of the order the cache files are given on the command line.
If two caches use the same namespace, their order with respect to each
other is undefined.

Bug: 279485059
Test: atest aconfig.test
Change-Id: I54c3950bbb7b2be7d96c8928e78ae83aa626c2e2
 2023-05-22 09:57:48 +02: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
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
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
Treehugger Robot
c179330edb Merge "16k: Add 16K variant kernel/ramdisk build targets" 2023-05-20 00:11:16 +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
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
Steve Berbary
9dd5ec96cf [automerger skipped] Update Security String to 2023-07-01 am: 053ad8aa1b am: 71dbb01307 am: b0733d4f1e am: 666a64473b -s ours am: 8dc00cfae4 -s ours am: fb5d27605d -s ours am: 7080fa2583 -s ours am: 240278dfc7 -s ours 
am skip reason: Merged-In I2bb1848e16aff436787a5bf43dbea18012d485a7 with SHA-1 26a7d4bd9e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23214071

Change-Id: Ibd97260dfa03d16597cc7d1549bb50d728f20d5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-19 01:23:58 +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
Steve Berbary
240278dfc7 [automerger skipped] Update Security String to 2023-07-01 am: 053ad8aa1b am: 71dbb01307 am: b0733d4f1e am: 666a64473b -s ours am: 8dc00cfae4 -s ours am: fb5d27605d -s ours am: 7080fa2583 -s ours 
am skip reason: Merged-In I2bb1848e16aff436787a5bf43dbea18012d485a7 with SHA-1 26a7d4bd9e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23214071

Change-Id: Id8624de6bed7e22cb79c8ae6dd4dec1a2ff6ad41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-19 00:43:43 +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
Steve Berbary
7080fa2583 [automerger skipped] Update Security String to 2023-07-01 am: 053ad8aa1b am: 71dbb01307 am: b0733d4f1e am: 666a64473b -s ours am: 8dc00cfae4 -s ours am: fb5d27605d -s ours 
am skip reason: Merged-In I2bb1848e16aff436787a5bf43dbea18012d485a7 with SHA-1 26a7d4bd9e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23214071

Change-Id: Ieede0d4113acbd045f30ea5c01fe5f474138757c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-19 00:01:23 +00:00
Kelvin Zhang
ab9fb56784 Merge "16k: Add 16K variant kernel/ramdisk build targets" 2023-05-19 00:00:32 +00:00
Steve Berbary
fb5d27605d [automerger skipped] Update Security String to 2023-07-01 am: 053ad8aa1b am: 71dbb01307 am: b0733d4f1e am: 666a64473b -s ours am: 8dc00cfae4 -s ours 
am skip reason: Merged-In I2bb1848e16aff436787a5bf43dbea18012d485a7 with SHA-1 26a7d4bd9e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23214071

Change-Id: I9ac86a0d9040902c0e40000d1ffca13fb11c098a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 23:11:43 +00:00
Steve Berbary
8dc00cfae4 [automerger skipped] Update Security String to 2023-07-01 am: 053ad8aa1b am: 71dbb01307 am: b0733d4f1e am: 666a64473b -s ours 
am skip reason: Merged-In I2bb1848e16aff436787a5bf43dbea18012d485a7 with SHA-1 26a7d4bd9e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23214071

Change-Id: I1d7b980ff3cb3b6a36dc2079bdca6ff60ce8c89a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 22:29:41 +00:00
Steve Berbary
666a64473b Update Security String to 2023-07-01 am: 053ad8aa1b am: 71dbb01307 am: b0733d4f1e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23214071

Change-Id: I1f63d2d560b51bfec718dbef8b302b1af0c811c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 21:37:43 +00:00
Dan Albert
ff66bb231c Merge "Adapt to gdbrunner packaging." am: d230125270 am: ce7c1016c5 
Original change: https://android-review.googlesource.com/c/platform/build/+/2592985

Change-Id: Ib0dc86222dea150fff0b21c900750e2b7bab5bde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 20:49:18 +00:00
Steve Berbary
b0733d4f1e Update Security String to 2023-07-01 am: 053ad8aa1b am: 71dbb01307 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23214071

Change-Id: I792f648ace840368e43c197b6fbb99f745bd03c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 20:48:39 +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
Dan Albert
ce7c1016c5 Merge "Adapt to gdbrunner packaging." am: d230125270 
Original change: https://android-review.googlesource.com/c/platform/build/+/2592985

Change-Id: Ief01ae7d4cc5f62aa23f1a7aface65021073c507
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 20:03:36 +00:00
Steve Berbary
71dbb01307 Update Security String to 2023-07-01 am: 053ad8aa1b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23214071

Change-Id: Ic8b2f08177994f51fcc35f13eeb5b2280824fccb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 19:59:13 +00:00
Dan Albert
d230125270 Merge "Adapt to gdbrunner packaging." 2023-05-18 18:43:22 +00:00
Steve Berbary
7fb5ef6926 [automerger skipped] Update Security String to 2023-07-01 am: 26a7d4bd9e am: c310efa9f1 am: 470e269362 -s ours am: 7fea641ca0 -s ours 
am skip reason: Merged-In I2bb1848e16aff436787a5bf43dbea18012d485a7 with SHA-1 d6c119bfaa is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23214525

Change-Id: I616b4552ac3a2e7be8be6e96ee8f78d1fbee5e52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 11:14:28 +00:00
Steve Berbary
7fea641ca0 [automerger skipped] Update Security String to 2023-07-01 am: 26a7d4bd9e am: c310efa9f1 am: 470e269362 -s ours 
am skip reason: Merged-In I2bb1848e16aff436787a5bf43dbea18012d485a7 with SHA-1 d6c119bfaa is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23214525

Change-Id: Iafa4a25f60ce6f2fa6e4fee715fe6c0954afbcbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 10:34:14 +00:00
Steve Berbary
470e269362 Update Security String to 2023-07-01 am: 26a7d4bd9e am: c310efa9f1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23214525

Change-Id: I108c76d795a1f0439c28d251454e6179cf9da9d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 09:32:11 +00:00
Steve Berbary
c310efa9f1 Update Security String to 2023-07-01 am: 26a7d4bd9e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23214525

Change-Id: I4ae82a9b16e7c625d33eeca339e012701bb68892
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 08:44:46 +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
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