StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
91,771 Commits 1 Branch 0 Tags
4cb15ae345c05a0862a6c0cb6ae7a669f6dc6b64
Commit Graph

91771 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
4cb15ae345 Merge "Filter REL out of PLATFORM_VERSION_ALL_CODENAMES." into main am: 624b0f4b2f am: 175dd937e4 am: fe9ad25625 am: 9cff78d6c4 
Original change: https://android-review.googlesource.com/c/platform/build/+/2773148

Change-Id: I5d3f95905ef861b8f13ef3ac1d9bc144c6d6ccaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-05 02:20:56 +00:00
Treehugger Robot
9cff78d6c4 Merge "Filter REL out of PLATFORM_VERSION_ALL_CODENAMES." into main am: 624b0f4b2f am: 175dd937e4 am: fe9ad25625 
Original change: https://android-review.googlesource.com/c/platform/build/+/2773148

Change-Id: I0b8d9dc8a3415bcde5475ce4cc7d654fc56e66d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-05 01:48:28 +00:00
Treehugger Robot
fe9ad25625 Merge "Filter REL out of PLATFORM_VERSION_ALL_CODENAMES." into main am: 624b0f4b2f am: 175dd937e4 
Original change: https://android-review.googlesource.com/c/platform/build/+/2773148

Change-Id: Ibfaa73d81fa4b296728c7e979b351751126911d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-05 01:15:53 +00:00
Treehugger Robot
175dd937e4 Merge "Filter REL out of PLATFORM_VERSION_ALL_CODENAMES." into main am: 624b0f4b2f 
Original change: https://android-review.googlesource.com/c/platform/build/+/2773148

Change-Id: Ifbffd104bfb476c7eb8af3aa2eeefae8a103309b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-05 00:41:48 +00:00
Treehugger Robot
624b0f4b2f Merge "Filter REL out of PLATFORM_VERSION_ALL_CODENAMES." into main 2023-10-05 00:08:08 +00:00
Dan Albert
5346f7db62 Filter REL out of PLATFORM_VERSION_ALL_CODENAMES. 
The codename of the current release is replaced by "REL" when the
build is configured as a release rather than a preview. For example,
PLATFORM_VERSION_CODENAME.UpsideDownCake will be "REL" rather than
UpsideDownCake in a -next target when the upcoming release is
UpsideDownCake. "REL" shouldn't really be treated as a codename
though. It's a placeholder to indicate that the build is a release and
so doesn't really have a codename. The list of all codenames ends up
in ro.build.version.all_codenames, and also ends up feeding the logic
for stub generation in soong, neither of which are places that should
include REL.

Bug: http://b/303087088
Test: m ndk # with barbet-next-userdebug in goog/main
Change-Id: I97972439e1f06c09f0ed59e7e2191c489a214e88
 2023-10-04 23:11:39 +00:00
Dennis Song
eb871ed425 Merge "Resolve conflict AVB rollback index location" into main am: 764585118f am: a503a56283 am: 1d35d931e1 am: 2c4493e016 
Original change: https://android-review.googlesource.com/c/platform/build/+/2769020

Change-Id: I00ca755e1e261f6e38dc0696e925074dd04d2a51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-04 19:24:38 +00:00
Treehugger Robot
c2a564762c Merge "Use deterministic salt for boot image avb footer" into main am: 2b181f9aa1 am: 006c13c27b am: efc6bdd970 am: 06b5c469ab 
Original change: https://android-review.googlesource.com/c/platform/build/+/2768202

Change-Id: I6259a6a2b61df7d05475a0db8725b3d8cc24602d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-04 19:23:10 +00:00
Dennis Song
2c4493e016 Merge "Resolve conflict AVB rollback index location" into main am: 764585118f am: a503a56283 am: 1d35d931e1 
Original change: https://android-review.googlesource.com/c/platform/build/+/2769020

Change-Id: Ibb95cef2bdd1d12d8195639b1e43ee67390e7d08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-04 18:50:49 +00:00
Treehugger Robot
06b5c469ab Merge "Use deterministic salt for boot image avb footer" into main am: 2b181f9aa1 am: 006c13c27b am: efc6bdd970 
Original change: https://android-review.googlesource.com/c/platform/build/+/2768202

Change-Id: I857d4b32fcbd848362dae06c0113f0b18587dd76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-04 18:49:40 +00:00
Dennis Song
1d35d931e1 Merge "Resolve conflict AVB rollback index location" into main am: 764585118f am: a503a56283 
Original change: https://android-review.googlesource.com/c/platform/build/+/2769020

Change-Id: Ibdffb4a013f45fdbb9285d11dd45e226a7c6579f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-04 18:18:59 +00:00
Treehugger Robot
efc6bdd970 Merge "Use deterministic salt for boot image avb footer" into main am: 2b181f9aa1 am: 006c13c27b 
Original change: https://android-review.googlesource.com/c/platform/build/+/2768202

Change-Id: I821633c3ce6b918c9b5129a9a419c1e71e3e415f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-04 18:18:06 +00:00
Dennis Song
a503a56283 Merge "Resolve conflict AVB rollback index location" into main am: 764585118f 
Original change: https://android-review.googlesource.com/c/platform/build/+/2769020

Change-Id: I4f6d2278efb2f5553201d2ae15dfc9b176575972
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-04 17:48:05 +00:00
Treehugger Robot
006c13c27b Merge "Use deterministic salt for boot image avb footer" into main am: 2b181f9aa1 
Original change: https://android-review.googlesource.com/c/platform/build/+/2768202

Change-Id: I834cfd2b29a2eb66f2f339108bfe9c511e6038f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-04 17:47:15 +00:00
Dennis Song
764585118f Merge "Resolve conflict AVB rollback index location" into main 2023-10-04 17:16:11 +00:00
Treehugger Robot
2b181f9aa1 Merge "Use deterministic salt for boot image avb footer" into main 2023-10-04 17:08:25 +00:00
Justin Yun
b6a2e011c3 Merge "Remove PRODUCT_PRODUCT_VNDK_VERSION from soong_config" into main am: f81405aab0 am: a1822c5b6b am: f1942a76cc am: 0b2321aed5 
Original change: https://android-review.googlesource.com/c/platform/build/+/2763508

Change-Id: I609c2f5550f83a1ef8d6d4447f4bb5053b11ae4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-04 08:40:05 +00:00
Justin Yun
0b2321aed5 Merge "Remove PRODUCT_PRODUCT_VNDK_VERSION from soong_config" into main am: f81405aab0 am: a1822c5b6b am: f1942a76cc 
Original change: https://android-review.googlesource.com/c/platform/build/+/2763508

Change-Id: I368a92e413ec974e60baf5f53387cdf441b095c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-04 08:08:22 +00:00
Justin Yun
f1942a76cc Merge "Remove PRODUCT_PRODUCT_VNDK_VERSION from soong_config" into main am: f81405aab0 am: a1822c5b6b 
Original change: https://android-review.googlesource.com/c/platform/build/+/2763508

Change-Id: I61c4a4fd70733d8f2239fd350d8d52b952a94d1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-04 07:37:44 +00:00
Justin Yun
a1822c5b6b Merge "Remove PRODUCT_PRODUCT_VNDK_VERSION from soong_config" into main am: f81405aab0 
Original change: https://android-review.googlesource.com/c/platform/build/+/2763508

Change-Id: Ic94faf3c5dda0f552424fa638e8f3f33c5c2d8d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-04 07:08:01 +00:00
Dennis Song
4aae62ee77 Resolve conflict AVB rollback index location 
Add an `--avb-resolve-rollback-index-location-conflict`
option in merge_target_files. When this option is set,
the merge tool will resolve conflicting index locations
by assigning the smallest unused index location.

This is to support merging system and vendor target files
from two different targets. In this case, the two target
files may have conflict rollback index location because
they were built independently.

Test: atest releasetools_test
Test: validate_target_files *-target_files-*.zip
Test: merge_target_files &&
        add_img_to_target_files &&
        img_from_target_files &&
        flash device
Bug: 300604688
Change-Id: Ibd18ef2a9f3784157fe17966f5364c3c81c9bd9f
 2023-10-04 06:45:15 +00:00
Justin Yun
f81405aab0 Merge "Remove PRODUCT_PRODUCT_VNDK_VERSION from soong_config" into main 2023-10-04 06:29:31 +00:00
Treehugger Robot
d2cb016246 Merge "Clean out old rustc compiler intermediates" into main am: 842d96dc40 am: 8644f9c8dd am: 44b7e9e1c4 am: 5fccb40704 
Original change: https://android-review.googlesource.com/c/platform/build/+/2769746

Change-Id: I6082f12a93886f171f297cfdee18a24ee612f930
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-04 01:58:06 +00:00
Treehugger Robot
5fccb40704 Merge "Clean out old rustc compiler intermediates" into main am: 842d96dc40 am: 8644f9c8dd am: 44b7e9e1c4 
Original change: https://android-review.googlesource.com/c/platform/build/+/2769746

Change-Id: I0b209b16c9d6a440f7bc8a7b908aa08cfb84eb6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-04 01:26:09 +00:00
Treehugger Robot
44b7e9e1c4 Merge "Clean out old rustc compiler intermediates" into main am: 842d96dc40 am: 8644f9c8dd 
Original change: https://android-review.googlesource.com/c/platform/build/+/2769746

Change-Id: Ice2242a9e24147437a64a96142fa059ac03bbef9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-04 00:54:57 +00:00
Treehugger Robot
2d56f8780f Merge "Allow installing fake vendor packages" into main am: 7683671bcd am: f676520f42 am: a4ce1535e6 am: f3a31e1978 
Original change: https://android-review.googlesource.com/c/platform/build/+/2768203

Change-Id: I3d80a291a87c8355a94b8acd6cb02a020f6f406a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-04 00:40:00 +00:00
Treehugger Robot
8644f9c8dd Merge "Clean out old rustc compiler intermediates" into main am: 842d96dc40 
Original change: https://android-review.googlesource.com/c/platform/build/+/2769746

Change-Id: Id6e3465eca92f9562ee4be2acb70121128cf3b01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-04 00:24:55 +00:00
Treehugger Robot
f3a31e1978 Merge "Allow installing fake vendor packages" into main am: 7683671bcd am: f676520f42 am: a4ce1535e6 
Original change: https://android-review.googlesource.com/c/platform/build/+/2768203

Change-Id: I9fbffe9141976731cd00f56e5a24333713989d28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-04 00:08:07 +00:00
Treehugger Robot
842d96dc40 Merge "Clean out old rustc compiler intermediates" into main 2023-10-04 00:01:08 +00:00
Treehugger Robot
a4ce1535e6 Merge "Allow installing fake vendor packages" into main am: 7683671bcd am: f676520f42 
Original change: https://android-review.googlesource.com/c/platform/build/+/2768203

Change-Id: Iee7e65d8f67bb73f309ebaf4dbde450796a9f519
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 23:33:59 +00:00
Treehugger Robot
f676520f42 Merge "Allow installing fake vendor packages" into main am: 7683671bcd 
Original change: https://android-review.googlesource.com/c/platform/build/+/2768203

Change-Id: I84f6eba29780fd637ec77c255cc3e8c702ee555a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 23:04:26 +00:00
Treehugger Robot
7683671bcd Merge "Allow installing fake vendor packages" into main 2023-10-03 22:40:30 +00:00
Cole Faust
976a52c007 Allow installing fake vendor packages 
This line in base_rules.mk requires a variable that's qualified by
target/host, the partition, and the module class. There didn't exist
one for target/vendor/fake, so fake vendor modules failed to compile.
Add a TARGET_OUT_FAKE so we can use fake vendor modules. This is aimed
at using install_symlink on the vendor partition.

https://cs.android.com/android/platform/superproject/main/+/main:build/make/core/base_rules.mk;l=279;drc=c67e769b8c44eeb9bb851f20003b63d35193e155

Bug: 205632228
Test: presubmits
Change-Id: If4618f90cebbafcd44e88e38513033282c37c1b7
 2023-10-03 14:27:35 -07:00
Zhi Dou
80a88dc828 Merge "aconfig: change Map.of to Map.ofEntries in FakeFeatureFlagsImp" into main am: d61f2efdbb am: 77cb4d4606 am: cbb9e0c7d8 am: 16dc23c0ed 
Original change: https://android-review.googlesource.com/c/platform/build/+/2768479

Change-Id: I2a6502c040cd0b160dc86ed4535ca473f5386c37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 19:37:41 +00:00
Jihoon Kang
f7b87a0950 Merge "Revert^2 "Add soong config variable Release_expose_flagged_api"" into main am: a65cdd5024 am: 078aa1a5ee am: 3e3b687dcd am: e82e2ef228 
Original change: https://android-review.googlesource.com/c/platform/build/+/2768376

Change-Id: Iee8e0aebaac9c55c43dde4d37a207d77555df315
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 19:37:23 +00:00
Kelvin Zhang
de53f7df43 Use deterministic salt for boot image avb footer 
avbtool by default generates a random salt everytime, this makes builds
less reproducible. Use sha256 checksum of kernel image as the hex to
make the build reproducible.

Test: th
Bug: 293313353

Change-Id: I959b3dee77654098ab9fde475f11eaee8d40c790
 2023-10-03 12:26:08 -07:00
Zhi Dou
16dc23c0ed Merge "aconfig: change Map.of to Map.ofEntries in FakeFeatureFlagsImp" into main am: d61f2efdbb am: 77cb4d4606 am: cbb9e0c7d8 
Original change: https://android-review.googlesource.com/c/platform/build/+/2768479

Change-Id: I596b90f7892742b43c056d076e5bc2fd961126c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 19:05:00 +00:00
Jihoon Kang
e82e2ef228 Merge "Revert^2 "Add soong config variable Release_expose_flagged_api"" into main am: a65cdd5024 am: 078aa1a5ee am: 3e3b687dcd 
Original change: https://android-review.googlesource.com/c/platform/build/+/2768376

Change-Id: If413202bb3488741746d71d558e1382907c18a00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 19:04:42 +00:00
Zhi Dou
cbb9e0c7d8 Merge "aconfig: change Map.of to Map.ofEntries in FakeFeatureFlagsImp" into main am: d61f2efdbb am: 77cb4d4606 
Original change: https://android-review.googlesource.com/c/platform/build/+/2768479

Change-Id: Ibf13b8f8e60563d979037e06eef1fde4a9c50da2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 18:48:44 +00:00
Zhi Dou
77cb4d4606 Merge "aconfig: change Map.of to Map.ofEntries in FakeFeatureFlagsImp" into main am: d61f2efdbb 
Original change: https://android-review.googlesource.com/c/platform/build/+/2768479

Change-Id: I82bc0386acaf7effd4a2890deb7148570d739d91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 18:33:05 +00:00
Jihoon Kang
3e3b687dcd Merge "Revert^2 "Add soong config variable Release_expose_flagged_api"" into main am: a65cdd5024 am: 078aa1a5ee 
Original change: https://android-review.googlesource.com/c/platform/build/+/2768376

Change-Id: I6a101aba8f3351381b73cc7046d292985b436157
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 18:32:50 +00:00
Jihoon Kang
078aa1a5ee Merge "Revert^2 "Add soong config variable Release_expose_flagged_api"" into main am: a65cdd5024 
Original change: https://android-review.googlesource.com/c/platform/build/+/2768376

Change-Id: I606e80325d05f52132acf1d940f362649817e141
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 18:02:14 +00:00
Zhi Dou
d61f2efdbb Merge "aconfig: change Map.of to Map.ofEntries in FakeFeatureFlagsImp" into main 2023-10-03 17:58:22 +00:00
Jihoon Kang
a65cdd5024 Merge "Revert^2 "Add soong config variable Release_expose_flagged_api"" into main 2023-10-03 17:55:17 +00:00
Colin Cross
42f5a6bb6a Clean out old rustc compiler intermediates 
The CL that splits rust complation and linking into separate actions
is being reverted to save disk space.  Delete the intermediates that
are no longer needed in order to immediately free the disk space.

Bug: 293349612
Test: builds
Change-Id: I1e9f015bf9b6ffe8ba3ccd11ac3075e90640e9b3
 2023-10-03 10:35:32 -07:00
Dennis Song
c34ffb9e1a Merge "Minor refactor tools/releasetools/common.py" into main am: 50e5fbd688 am: de693db329 am: 0545076630 am: 0f663278f7 
Original change: https://android-review.googlesource.com/c/platform/build/+/2769023

Change-Id: I9d97db37377a48734703da9a3a7c5c41e7d90b1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 08:31:44 +00:00
Dennis Song
0f663278f7 Merge "Minor refactor tools/releasetools/common.py" into main am: 50e5fbd688 am: de693db329 am: 0545076630 
Original change: https://android-review.googlesource.com/c/platform/build/+/2769023

Change-Id: Id58793c66a5eeae22c74bb7bc2cdf32d446d440b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 07:58:48 +00:00
Dennis Song
0545076630 Merge "Minor refactor tools/releasetools/common.py" into main am: 50e5fbd688 am: de693db329 
Original change: https://android-review.googlesource.com/c/platform/build/+/2769023

Change-Id: Ic96da208ba3c40f2202e34e4f667ccac4687280e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 07:28:27 +00:00
Dennis Song
de693db329 Merge "Minor refactor tools/releasetools/common.py" into main am: 50e5fbd688 
Original change: https://android-review.googlesource.com/c/platform/build/+/2769023

Change-Id: Ia0fdef30d550535aec9bd368535596198e2c6a9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 06:58:00 +00:00
Dennis Song
50e5fbd688 Merge "Minor refactor tools/releasetools/common.py" into main 2023-10-03 06:19:23 +00:00