StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
89,900 Commits 1 Branch 0 Tags
d34a22ce39a82bf4a7e8e0735fb6058558e44c4b
Commit Graph

89900 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Yun
d34a22ce39 Restore the VNDK list for v34 which was frozen 
VNDK v34 was already frozen and must not be changed. Restore the
original version of the VNDK list.

Ignore-AOSP-First: This is not released in AOSP yet
Bug: 299867815
Test: lunch cf_x86_64_phone-next-userdebug; m
Change-Id: I0edb24568f28caf8b08cfa5c1b6dba44d3c91a9e
 2023-09-20 04:48:53 +00:00
Cole Faust
0cfbf4ef21 Merge "Add ProductDirectory variable to soong_config.mk" into main am: b00035955c am: 87e0fc95e9 
Original change: https://android-review.googlesource.com/c/platform/build/+/2755206

Change-Id: I394c156d1b366b81d41b29b4ea6e84240579fe88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-19 21:21:59 +00:00
Greg Kaiser
4e7ba89ccc Merge "Revert "Give an error when trying to build "next" targets"" into main am: d5799abc55 am: b79f1241b3 
Original change: https://android-review.googlesource.com/c/platform/build/+/2751295

Change-Id: I112aa2321ba3ea1857068de60660f787ed9b2fd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-19 21:21:25 +00:00
Cole Faust
87e0fc95e9 Merge "Add ProductDirectory variable to soong_config.mk" into main am: b00035955c 
Original change: https://android-review.googlesource.com/c/platform/build/+/2755206

Change-Id: Ie1df49e6d56ba0d67ffa863eebbbf7d6a06cddea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-19 21:16:34 +00:00
Cole Faust
b00035955c Merge "Add ProductDirectory variable to soong_config.mk" into main 2023-09-19 20:42:52 +00:00
Greg Kaiser
b79f1241b3 Merge "Revert "Give an error when trying to build "next" targets"" into main am: d5799abc55 
Original change: https://android-review.googlesource.com/c/platform/build/+/2751295

Change-Id: I0d0b0e6dd8038998b6babaf5eea28220350b199b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-19 20:24:10 +00:00
Greg Kaiser
d5799abc55 Merge "Revert "Give an error when trying to build "next" targets"" into main 2023-09-19 19:55:07 +00:00
Treehugger Robot
31cbb405eb Merge "Tidy AVF build-time flags" into main am: 106f7202d8 am: c3744daced 
Original change: https://android-review.googlesource.com/c/platform/build/+/2754886

Change-Id: I9ff46c2d69684612a7ad00c7a79e212e2f0bc4d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-19 17:47:51 +00:00
Treehugger Robot
c3744daced Merge "Tidy AVF build-time flags" into main am: 106f7202d8 
Original change: https://android-review.googlesource.com/c/platform/build/+/2754886

Change-Id: I8daa27e012a897c96f8e45bc9af2e88c49c12a9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-19 16:49:30 +00:00
Prashant Dubey
2673f2960a Merge "Fix typos in METADATA.txt inside boot.zip" into main am: 7f8e4b5549 am: f442476158 
Original change: https://android-review.googlesource.com/c/platform/build/+/2755026

Change-Id: I1be77e218d2747bc96539766ae1917064fd7c0b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-19 15:59:18 +00:00
Treehugger Robot
106f7202d8 Merge "Tidy AVF build-time flags" into main 2023-09-19 15:45:14 +00:00
Prashant Dubey
f442476158 Merge "Fix typos in METADATA.txt inside boot.zip" into main am: 7f8e4b5549 
Original change: https://android-review.googlesource.com/c/platform/build/+/2755026

Change-Id: Ia227b0e4236b1a3d1ec0747bd1342c01b6681e0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-19 15:00:36 +00:00
Prashant Dubey
7f8e4b5549 Merge "Fix typos in METADATA.txt inside boot.zip" into main 2023-09-19 14:26:19 +00:00
Alan Stokes
efcd43d7e6 Tidy AVF build-time flags 
Sort into alphabetical order, to match the order in build_flags.bzl.

Fix a typo that then became obvious.

Bug: 278067832
Test: Builds, with and without flag enabled
Change-Id: I89ca6b3f96634ece089f86d69bd0b40fc074adff
 2023-09-19 15:05:58 +01:00
Lokesh Kumar Goel
ae0131e14a [automerger skipped] Update Security String to 2023-11-01 am: e409832381 am: 5ae5dafab7 am: 5640313a7c am: 13ad3b22fa -s ours am: 73cfeab82e -s ours 
am skip reason: Merged-In I225fe9e9a23ad9c3af1e065053732bf6c7019afb with SHA-1 e409832381 is already in history

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

Change-Id: I3baa564551896828a82781f0b6b4d934f1b252e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-19 05:14:43 +00:00
Lokesh Kumar Goel
c98ed06c13 [automerger skipped] Update Security String to 2023-11-01 am: e409832381 am: 5ae5dafab7 am: 34dbd220e3 -s ours am: a3598097a7 -s ours 
am skip reason: Merged-In I225fe9e9a23ad9c3af1e065053732bf6c7019afb with SHA-1 8584b917f1 is already in history

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

Change-Id: I0f4349a94f78c0ad57b74f042f7d4f66caf1a38d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-19 05:14:13 +00:00
Lokesh Kumar Goel
73cfeab82e [automerger skipped] Update Security String to 2023-11-01 am: e409832381 am: 5ae5dafab7 am: 5640313a7c am: 13ad3b22fa -s ours 
am skip reason: Merged-In I225fe9e9a23ad9c3af1e065053732bf6c7019afb with SHA-1 e409832381 is already in history

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

Change-Id: I0e77c71ea20895f8f543f312d588899f220262b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-19 05:13:09 +00:00
Lokesh Kumar Goel
a3598097a7 [automerger skipped] Update Security String to 2023-11-01 am: e409832381 am: 5ae5dafab7 am: 34dbd220e3 -s ours 
am skip reason: Merged-In I225fe9e9a23ad9c3af1e065053732bf6c7019afb with SHA-1 8584b917f1 is already in history

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

Change-Id: Ieff119f82a3ef7eacb437e33509b5591f6542fea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-19 04:34:24 +00:00
Lokesh Kumar Goel
13ad3b22fa Update Security String to 2023-11-01 am: e409832381 am: 5ae5dafab7 am: 5640313a7c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24794943

Change-Id: I2a78dac728f48640518632527b47572fe98ec4ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-19 04:26:24 +00:00
Lokesh Kumar Goel
5640313a7c Update Security String to 2023-11-01 am: e409832381 am: 5ae5dafab7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24794943

Change-Id: Ice5f39f1911a338246a8a2c0366f28780cab1192
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-19 03:27:51 +00:00
Lokesh Kumar Goel
34dbd220e3 Update Security String to 2023-11-01 am: e409832381 am: 5ae5dafab7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24794943

Change-Id: I524b19f1acdfabc74eb5a7a74cb0a6546775fd5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-19 03:27:34 +00:00
Lokesh Kumar Goel
5ae5dafab7 Update Security String to 2023-11-01 am: e409832381 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24794943

Change-Id: Icd82c7495c7b312814040e0f3511c6170cce9e8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-19 02:45:22 +00:00
Jooyung Han
7d06ca9d8d Merge "Revert^2 "Install CAS HAL APEX"" into main am: 4f6eb3112f am: a60ddcab86 
Original change: https://android-review.googlesource.com/c/platform/build/+/2752546

Change-Id: I9e300e2b69b22a343a530ef66274db21ebe41f4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-19 01:57:03 +00:00
Jooyung Han
a60ddcab86 Merge "Revert^2 "Install CAS HAL APEX"" into main am: 4f6eb3112f 
Original change: https://android-review.googlesource.com/c/platform/build/+/2752546

Change-Id: Ib2e535c0a3991f4d58c3a0480ee3373eaa62894d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-19 01:50:44 +00:00
Jooyung Han
4f6eb3112f Merge "Revert^2 "Install CAS HAL APEX"" into main 2023-09-19 01:18:07 +00:00
Jingwen Chen
f8cb657391 Merge "Make auto_gen_test_config available to Bazel." into main am: 84b5bb9139 am: 20ebf61214 
Original change: https://android-review.googlesource.com/c/platform/build/+/2752414

Change-Id: Ieb0de72b47382a2e0ee7617a4f88fc9a36a79beb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-19 00:11:04 +00:00
Jingwen Chen
20ebf61214 Merge "Make auto_gen_test_config available to Bazel." into main am: 84b5bb9139 
Original change: https://android-review.googlesource.com/c/platform/build/+/2752414

Change-Id: I733ef23456e96bb888b94bd440dab7706eb380d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-19 00:04:46 +00:00
Jingwen Chen
84b5bb9139 Merge "Make auto_gen_test_config available to Bazel." into main 2023-09-18 23:27:14 +00:00
Lokesh Kumar Goel
e409832381 Update Security String to 2023-11-01 
Bug: 298044885

Change-Id: I225fe9e9a23ad9c3af1e065053732bf6c7019afb
Merged-In: I225fe9e9a23ad9c3af1e065053732bf6c7019afb
 2023-09-18 22:18:29 +00:00
Cole Faust
c7dcd2629a Add ProductDirectory variable to soong_config.mk 
Bug: 297269187
Test: m nothing
Change-Id: Ib14ce9d911c86afb5bb770c4b05977021e771c0f
 2023-09-18 13:07:22 -07:00
Prashant Dubey
029a6159df Fix typos in METADATA.txt inside boot.zip 
Bug: 287652269
Test: m dist out/dist/boot.zip
Change-Id: I55313453393f7a5c3ec565c476722c5ee4d8fc38
 2023-09-18 18:27:50 +00:00
Jingwen Chen
f3406e64f7 Make auto_gen_test_config available to Bazel. 
In the Bazel rule, the actual AndroidManifest.xml file isn't available
in the providers of the android_binary dependency. And for good reason,
we should also rely on aapt2 to dump the manifest contents from the
final packaged APK anyway, but this auto gen script doesn't support
reading the output of aapt2 dump.

This CL adds a simple reader of the output of `aapt2 dump xmltree`, and
enabled if the xmltree content is passed to this tool instead of
AndroidManifest.xml.

Also fixup auto_gen_test_config_test.py. The test was completely failing.

Test: atest auto_gen_test_config_test
Test: presubmits

Change-Id: I7fecd927d0ed7847b6463d964b3698f4164b0177
 2023-09-18 12:34:29 +00:00
Liz Kammer
4ca5355d1b Merge "Cleanspec to remove tools/metalava subdir" into main am: 5922b630c5 am: a438b6dae2 
Original change: https://android-review.googlesource.com/c/platform/build/+/2754005

Change-Id: I79072bc5c28f6cb5f9a450850cd4803feeaa0ce6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-15 22:47:55 +00:00
Liz Kammer
a438b6dae2 Merge "Cleanspec to remove tools/metalava subdir" into main am: 5922b630c5 
Original change: https://android-review.googlesource.com/c/platform/build/+/2754005

Change-Id: I70e30741426f093bc48c2650515c2a285082dcf4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-15 21:49:24 +00:00
Liz Kammer
5922b630c5 Merge "Cleanspec to remove tools/metalava subdir" into main 2023-09-15 20:32:43 +00:00
Treehugger Robot
8868eb3143 Merge "Respect framework partition set while merging meta files" into main am: b25e443bc5 am: ca8e0fba2a 
Original change: https://android-review.googlesource.com/c/platform/build/+/2749885

Change-Id: If385c66f32a4e08ceb2d43aef84d2929909b0690
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-15 20:07:12 +00:00
Treehugger Robot
ca8e0fba2a Merge "Respect framework partition set while merging meta files" into main am: b25e443bc5 
Original change: https://android-review.googlesource.com/c/platform/build/+/2749885

Change-Id: Ib22c0f6680d7cc30909dd975faebeae9d066bda2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-15 19:08:12 +00:00
Liz Kammer
c4d9d32fe8 Cleanspec to remove tools/metalava subdir 
Test: CI
Change-Id: I412a093ef3964fcecf2b726cbfe0f78032242e95
 2023-09-15 14:09:09 -04:00
Treehugger Robot
b25e443bc5 Merge "Respect framework partition set while merging meta files" into main 2023-09-15 17:52:17 +00:00
Yu Liu
d42b9ba0b3 Merge "Support aconfig_declarations, aconfig_values and aconfig_value_set" into main am: fc68cf4d45 am: 7b09b7c614 
Original change: https://android-review.googlesource.com/c/platform/build/+/2745809

Change-Id: I49ff58524f42faf34d4758708ca615db69836b11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-15 17:27:13 +00:00
Yu Liu
7b09b7c614 Merge "Support aconfig_declarations, aconfig_values and aconfig_value_set" into main am: fc68cf4d45 
Original change: https://android-review.googlesource.com/c/platform/build/+/2745809

Change-Id: I096473fdcf27348d39e2b24031faec2c6c2cf0c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-15 17:22:06 +00:00
Yu Liu
fc68cf4d45 Merge "Support aconfig_declarations, aconfig_values and aconfig_value_set" into main 2023-09-15 16:46:01 +00:00
Ted Bauer
b0ab57ad27 Merge "Dump Aconfig flags pb file alongside textproto." into main am: 202eab9b14 am: 8aa65dd354 
Original change: https://android-review.googlesource.com/c/platform/build/+/2752625

Change-Id: I521468490f844718e8ee5cdff77754f139c68ca2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-15 16:32:22 +00:00
Ted Bauer
8aa65dd354 Merge "Dump Aconfig flags pb file alongside textproto." into main am: 202eab9b14 
Original change: https://android-review.googlesource.com/c/platform/build/+/2752625

Change-Id: I185ed112926cb95aa6082a1b1c5de195be538879
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-15 15:33:17 +00:00
Greg Kaiser
6c1723254e Revert "Give an error when trying to build "next" targets" 
This reverts commit f5eaf3cff3.

Reason for revert: -next targets are now healthy
Bug: 294161396

Change-Id: Idd61fd65d59a90057db9d6909267f5550cd5b2fe
 2023-09-15 14:46:54 +00:00
Ted Bauer
202eab9b14 Merge "Dump Aconfig flags pb file alongside textproto." into main 2023-09-15 14:19:26 +00:00
Dennis Song
36ce326f95 Respect framework partition set while merging meta files 
The framework_partition_set would be generated from
framework_item_list and we should respect this partition
set while merging META/ab_partitions.txt.

This is to handle the case when we use a complete merged
target files package as the framework-target-files, where
its ab_partitions.txt may have non-framework partitions.
So we need to filter them out to prevent from the merged
meta file has some partitions that don't exist.

Test: merge_target_files &&
        add_img_to_target_files &&
	img_from_target_files &&
	flash device
Bug: 300193612
Change-Id: I0a76d706a20dcaffa2533278db7383563f03ec02
 2023-09-15 06:20:19 +00:00
Treehugger Robot
014c021972 Merge "Define PRODUCT_PRODUCT_VNDK_VERSION as current by default" into main am: 2a65d6a7e9 am: 251a45040a 
Original change: https://android-review.googlesource.com/c/platform/build/+/2752225

Change-Id: Ic885f668524fdcc1f0c87f0af2f00215694bc0eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-15 00:25:06 +00:00
Treehugger Robot
251a45040a Merge "Define PRODUCT_PRODUCT_VNDK_VERSION as current by default" into main am: 2a65d6a7e9 
Original change: https://android-review.googlesource.com/c/platform/build/+/2752225

Change-Id: I64f571b8c84d8facead888f3b55a89ecf67087ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-14 23:25:19 +00:00
Treehugger Robot
2a65d6a7e9 Merge "Define PRODUCT_PRODUCT_VNDK_VERSION as current by default" into main 2023-09-14 22:19:02 +00:00