StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
87,306 Commits 1 Branch 0 Tags
e80e8b4c5cbde72338ee6e88d3b51a5f36656be2
Commit Graph

87306 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
d4998848c4 Merge changes from topic "b/278060169" am: 2231df8a54 am: 5ad4cff1cb am: 892825189a 
Original change: https://android-review.googlesource.com/c/platform/build/+/2599485

Change-Id: I2f511f1a6a437ff7783c885818f98635d23d03ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-23 10:50:31 +00:00
Jeongik Cha
ca4d90bfcd [automerger skipped] BUILD_NUMBER and BUILD_HOSTNAME doesn't affect kati regeneration am: 05210f96b3 am: f295008821 -s ours am: 5e0c99ec46 -s ours 
am skip reason: Merged-In I1b37760242853c1a145bad255d0bb15524234b25 with SHA-1 d0b037235d is already in history

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

Change-Id: Idc382485cbc9269159f2d72a477739011a8a08a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-23 10:50:25 +00:00
Treehugger Robot
892825189a Merge changes from topic "b/278060169" am: 2231df8a54 am: 5ad4cff1cb 
Original change: https://android-review.googlesource.com/c/platform/build/+/2599485

Change-Id: Ic9f1572f61adc84f694ad131314892d2b7236bc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-23 10:05:31 +00:00
Jeongik Cha
5e0c99ec46 [automerger skipped] BUILD_NUMBER and BUILD_HOSTNAME doesn't affect kati regeneration am: 05210f96b3 am: f295008821 -s ours 
am skip reason: Merged-In I1b37760242853c1a145bad255d0bb15524234b25 with SHA-1 d0b037235d is already in history

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

Change-Id: I0d6a82425fb6f0db5a1767943005ac08a50457df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-23 10:05:25 +00:00
Treehugger Robot
5ad4cff1cb Merge changes from topic "b/278060169" am: 2231df8a54 
Original change: https://android-review.googlesource.com/c/platform/build/+/2599485

Change-Id: I6099574659b1880f4be6f8a8e4557b171863f9d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-23 09:28:09 +00:00
Jeongik Cha
f295008821 BUILD_NUMBER and BUILD_HOSTNAME doesn't affect kati regeneration am: 05210f96b3 
Original change: https://android-review.googlesource.com/c/platform/build/+/2563995

Change-Id: Ieaa619837f1c212265075ea59ddc74be34afd783
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-23 09:28:02 +00:00
Treehugger Robot
2231df8a54 Merge changes from topic "b/278060169" 
* changes:
  Replace touch -a with comment
  BUILD_NUMBER and BUILD_HOSTNAME doesn't affect kati regeneration
 2023-05-23 08:56:48 +00:00
Jeongik Cha
7e00234b84 Fix build error about jar manifest 
It still depended on old intermediate files (out/host/common/obj/JAVA_LIBRARIES/<modulename>_intermediates//manifest.mf)
But the intermediate manifest.mf isn't created after aosp/2563995,
it causes merge_zip error due to missing file.
So make it use the manifest file from source directly.

Test: m out/host/common/obj/JAVA_LIBRARIES/ahat-tests_intermediates/classes-combined.jar
Bug: 278060169
Bug: 283821744
Bug: 283903672
Change-Id: Iebff6bf90b93dab693aef2492383cd3b03f239fb
 2023-05-23 05:59:09 +00:00
Treehugger Robot
2f727af4b9 Merge "Add 16K artifacts to PREBUILT_IMAGES/ dir of target_files" am: 8485145bd7 am: f6d61bd3c1 am: af0cfd9e98 
Original change: https://android-review.googlesource.com/c/platform/build/+/2595883

Change-Id: I4f6bac39abfd1ec19d21b763201770c92a2e0c3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-23 04:55:01 +00:00
Treehugger Robot
af0cfd9e98 Merge "Add 16K artifacts to PREBUILT_IMAGES/ dir of target_files" am: 8485145bd7 am: f6d61bd3c1 
Original change: https://android-review.googlesource.com/c/platform/build/+/2595883

Change-Id: I18e119790d1f63e9f50ef62a008fe9da5c9de92f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-23 04:09:02 +00:00
Treehugger Robot
f6d61bd3c1 Merge "Add 16K artifacts to PREBUILT_IMAGES/ dir of target_files" am: 8485145bd7 
Original change: https://android-review.googlesource.com/c/platform/build/+/2595883

Change-Id: I36815cfa877645e242d40a3b4b4cadd0e50a6ef5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-23 03:30:56 +00:00
Treehugger Robot
8485145bd7 Merge "Add 16K artifacts to PREBUILT_IMAGES/ dir of target_files" 2023-05-23 02:36:17 +00:00
Yihan Dong
355b6b4a52 Merge "Remove GTS-Verifier license check" into udc-dev am: a75b82f9d2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23343092

Change-Id: I41e817b323c93d103486825200936b41fdfac8d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-23 02:23:02 +00:00
Jeongik Cha
43aaa8989e BUILD_NUMBER and BUILD_HOSTNAME doesn't affect kati regeneration am: d0b037235d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23378947

Change-Id: I0fef5b60fe9f2aeeff7d09b55901782f3fcd8df2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-23 02:07:17 +00:00
Yihan Dong
a75b82f9d2 Merge "Remove GTS-Verifier license check" into udc-dev 2023-05-23 02:00:54 +00:00
Devin Moore
2ea277dbce Update vndk with update-vndk-list.sh 
libdiskconfig has been removed.

Test: m
Bug: 280829178
Change-Id: I58948c92012501f2666c8c2b6a99343a141ad1d0
 2023-05-23 00:34:09 +00:00
Liz Kammer
0376ea682f [automerger skipped] Add BUILD_BROKEN_PLUGIN_VALIDATION flag am: 03bd5812e8 -s ours 
am skip reason: Merged-In Ia2fe83d82ead618e480e99a82b1b825ed08d3eab with SHA-1 f24be9dba9 is already in history

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

Change-Id: Ia55c002895740ce494e854bb0e09009e0b9d8dff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-22 22:53:38 +00:00
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
Jeongik Cha
54403316c0 Replace touch -a with comment 
Bug: 278060169
Test: m
Change-Id: Ie5ad1b5c6cf335cc3de641fd76a76bfa5f3f79cb
 2023-05-23 07:14:51 +09:00
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
Satoshi Futenma
5f0823aecb [automerger skipped] Add merge_ota to otatools am: 792dfa537a -s ours 
am skip reason: Merged-In I40c3866bfb016aa1dec1c6dc2d95c66deb1e61ea with SHA-1 6d56d45f96 is already in history

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

Change-Id: Ie4b5c7a4d577f87318744a1889911fbbd63341b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-22 19:19:42 +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
Kelvin Zhang
2268091521 Unsparse images before generating OTA 
Test: th
Bug: 283172692
Change-Id: Ie6d3dc704fd9a8c107e2888222e4c2bf804dad3e
 2023-05-22 10:22:59 -07: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
f44cf94667 Merge changes from topic "aconfig-stable-flag-order" am: f469fd6cc6 am: 1ad09e0bfa am: 90ea531bb2 
Original change: https://android-review.googlesource.com/c/platform/build/+/2595206

Change-Id: I08cd699e067580ed95a6d17c2a47cecd0e88db54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-22 13:23:47 +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
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
Treehugger Robot
c179330edb Merge "16k: Add 16K variant kernel/ramdisk build targets" 2023-05-20 00:11:16 +00:00