StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
96,226 Commits 1 Branch 0 Tags
2a19321e3d86f23f35bf67c22885c64dae7b51d8
Commit Graph

36880 Commits

Author SHA1 Message Date
Elliott Hughes
cf0fe7c6ee Merge "Have the sanitizers trap rather than abort." into main am: 14e0d156fb am: 18b102d5c0 am: ba84ad5c90 am: ed78727898 am: b3e0c41007 
Original change: https://android-review.googlesource.com/c/platform/build/+/2777875

Change-Id: I675b70c9ede40d2d72c298b0dd6c7aa2225171aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-09 20:03:45 +00:00
Elliott Hughes
ba84ad5c90 Merge "Have the sanitizers trap rather than abort." into main am: 14e0d156fb am: 18b102d5c0 
Original change: https://android-review.googlesource.com/c/platform/build/+/2777875

Change-Id: Ic9addf8e73f8dceb64eebbe2991e5e5efa7fc17d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-09 18:23:40 +00:00
Elliott Hughes
14e0d156fb Merge "Have the sanitizers trap rather than abort." into main 2023-10-09 16:08:06 +00:00
Sam Dubey
e7e83cbddc Merge changes from topic "revert-24055201-next-prebuilts-enable-LJUEEMOUMW" into main 
* changes:
  Revert "DO NOT MERGE: Enable mainline prebuilts for device targets"
  Revert "Use build flag RELEASE_DEFAULT_MODULE_BUILD_FROM_SOURCE ..."
 2023-10-09 14:32:08 +00:00
Sam Dubey
3abb16981d Revert "DO NOT MERGE: Enable mainline prebuilts for device targets" 
Revert submission 24055201-next-prebuilts-enable

Reason for revert: Breaking PM platinum tests b/304247444

Reverted changes: /q/submissionid:24055201-next-prebuilts-enable

Change-Id: Ie3e8453585af2799e7a0b2191934e678661ea689
 2023-10-09 13:49:41 +00:00
Sam Dubey
22f5d3abc6 Revert "Use build flag RELEASE_DEFAULT_MODULE_BUILD_FROM_SOURCE ..." 
Revert submission 24055201-next-prebuilts-enable

Reason for revert: Breaking PM platinum tests b/304247444

Reverted changes: /q/submissionid:24055201-next-prebuilts-enable

Change-Id: Icee311fc4be85916849e37d19a0b2ec78259753c
 2023-10-09 13:49:41 +00:00
Alyssa Ketpreechasawat
31cd347fa8 Merge changes from topic "next-prebuilts-enable" into main 
* changes:
  Use build flag RELEASE_DEFAULT_MODULE_BUILD_FROM_SOURCE to enable/disable module build from prebuilts.
  DO NOT MERGE: Enable mainline prebuilts for device targets
 2023-10-09 11:32:26 +00:00
Treehugger Robot
827e245f6a Merge "makefile:strip generic ramdisk kernel modules in android build system." into main am: 02eadb873f am: 47744f6c99 am: 9ea4ee44b7 am: 8d2d3e37d5 am: 64edd2be56 
Original change: https://android-review.googlesource.com/c/platform/build/+/2775567

Change-Id: I07627a3e8a1bffe3029fc060064e203510977949
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-07 05:51:31 +00:00
Treehugger Robot
9ea4ee44b7 Merge "makefile:strip generic ramdisk kernel modules in android build system." into main am: 02eadb873f am: 47744f6c99 
Original change: https://android-review.googlesource.com/c/platform/build/+/2775567

Change-Id: I08e4c3e792f555fee709d4850ee2630c56add791
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-07 04:14:13 +00:00
Treehugger Robot
02eadb873f Merge "makefile:strip generic ramdisk kernel modules in android build system." into main 2023-10-07 03:17:16 +00:00
Alyssa Ketpreechasawat
e905dc262e Merge "Revert "Revert "Add RELEASE_DEFAULT_MODULE_BUILD_FROM_SOURCE in config.""" into main am: 8028a4c59f am: 8404655faf am: fb0e5d5a90 am: 5c928c85d4 am: 4b8b66f67f 
Original change: https://android-review.googlesource.com/c/platform/build/+/2777427

Change-Id: I5b47a8d3cbb7d437550c4850363ca8dbaafdaea9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-07 00:55:28 +00:00
Elliott Hughes
40f0c5cad3 Have the sanitizers trap rather than abort. 
abort() seems friendlier, but in practice it puts a couple of irrelevant
libc.so frames on the top of the stack trace and clobbers all the
registers that might have helped remotely debug a sanitizer failure.
Let's switch to trapping directly in the sanitized code instead.

Bug: http://b/298741930
Test: treehugger
Change-Id: I4fca63cb42bfba16a934c1fa88b08697faf3be41
 2023-10-06 22:34:36 +00:00
Alyssa Ketpreechasawat
fb0e5d5a90 Merge "Revert "Revert "Add RELEASE_DEFAULT_MODULE_BUILD_FROM_SOURCE in config.""" into main am: 8028a4c59f am: 8404655faf 
Original change: https://android-review.googlesource.com/c/platform/build/+/2777427

Change-Id: I69e407d089c97925dfc326c3668ba3e56c72601b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-06 19:30:42 +00:00
Alyssa Ketpreechasawat
8028a4c59f Merge "Revert "Revert "Add RELEASE_DEFAULT_MODULE_BUILD_FROM_SOURCE in config.""" into main 2023-10-06 19:17:40 +00:00
Alyssa Ketpreechasawat
b419e50c83 Revert "Add RELEASE_DEFAULT_MODULE_BUILD_FROM_SOURCE in config." 
Revert submission 2761821-suppress-hiddenapi-check

Reason for revert: have some typo - break next build

Reverted changes: /q/submissionid:2761821-suppress-hiddenapi-check
(cherry picked from https://android-review.googlesource.com/q/commit:55702a7fb49af4e1fbbefea6a6dd6defecaf7065)
Merged-In: I24f91b77f76cf0950d407aee3dedc30412213d00
Change-Id: I24f91b77f76cf0950d407aee3dedc30412213d00
 2023-10-06 11:02:42 +00:00
Alyssa Ketpreechasawat
279c313aaa Merge "Revert "Add RELEASE_DEFAULT_MODULE_BUILD_FROM_SOURCE in config."" into main am: 20ef679451 am: d03db17b99 
Original change: https://android-review.googlesource.com/c/platform/build/+/2777309

Change-Id: I90bd0cd34be567c0f80df26b0ac463a5313cc9f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-06 09:36:09 +00:00
Tapas Pradhan
d2d30f6baf makefile:strip generic ramdisk kernel modules in android build system. 
Buganizer: 298884633
Test: manual test
Change-Id: I72b21d806ab18e8274dff04445415fe8d2613729
 2023-10-06 13:30:41 +05:30
Alyssa Ketpreechasawat
0c75ea8ca7 Revert "Revert "Add RELEASE_DEFAULT_MODULE_BUILD_FROM_SOURCE in config."" 
This reverts commit 55702a7fb4.

Reason for revert: resubmit

Change-Id: I5ddb51159e69045ac6c370fdcd11f6bd9f86dd65
 2023-10-06 07:01:03 +00:00
Alyssa Ketpreechasawat
20ef679451 Merge "Revert "Add RELEASE_DEFAULT_MODULE_BUILD_FROM_SOURCE in config."" into main 2023-10-06 06:18:18 +00:00
Xin Li
564b80060f Merge "Merge Android 14" into main 2023-10-06 05:34:22 +00:00
Alyssa Ketpreechasawat
55702a7fb4 Revert "Add RELEASE_DEFAULT_MODULE_BUILD_FROM_SOURCE in config." 
Revert submission 2761821-suppress-hiddenapi-check

Reason for revert: have some typo - break next build

Reverted changes: /q/submissionid:2761821-suppress-hiddenapi-check

Change-Id: I24f91b77f76cf0950d407aee3dedc30412213d00
 2023-10-06 03:42:42 +00:00
Alyssa Ketpreechasawat
f470279aaf Merge "Add RELEASE_DEFAULT_MODULE_BUILD_FROM_SOURCE in config." into main am: eda7bebd77 am: 179746d11e am: 3ce9be17a1 am: f2cf72ddf8 am: b10627b112 
Original change: https://android-review.googlesource.com/c/platform/build/+/2761945

Change-Id: I06706c99a65376ed7e1b7f7a9402db4767eb653e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-06 02:37:02 +00:00
Alyssa Ketpreechasawat
3ce9be17a1 Merge "Add RELEASE_DEFAULT_MODULE_BUILD_FROM_SOURCE in config." into main am: eda7bebd77 am: 179746d11e 
Original change: https://android-review.googlesource.com/c/platform/build/+/2761945

Change-Id: I7276afe2f54e449bcd005afb108665490b0b9391
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-06 01:02:50 +00:00
Alyssa Ketpreechasawat
179746d11e Merge "Add RELEASE_DEFAULT_MODULE_BUILD_FROM_SOURCE in config." into main am: eda7bebd77 
Original change: https://android-review.googlesource.com/c/platform/build/+/2761945

Change-Id: Ie5c21f53e923f0531d17105fc3d618c4b493434a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-06 00:31:45 +00:00
Alyssa Ketpreechasawat
eda7bebd77 Merge "Add RELEASE_DEFAULT_MODULE_BUILD_FROM_SOURCE in config." into main 2023-10-05 23:51:30 +00:00
Dan Albert
2610a328ce Filter REL out of preview codenames. 
Relanding https://r.android.com/2773148 in a different way, since
removing REL from ALL_CODENAMES prevents -next builds from booting
(see the comment for the code that relies on this behavior).

This reverts commit d637190deb.

Bug: http://b/303087088
Test: m ndk # with barbet-next-userdebug in goog/main
Change-Id: I8f750645f79c3cf48a85879c36e1549df47eee97
 2023-10-05 21:32:06 +00:00
Alyssa Ketpreechasawat
0d277eb65d Use build flag RELEASE_DEFAULT_MODULE_BUILD_FROM_SOURCE to enable/disable module build from prebuilts. 
This will allow us to enable/disable module build from prebuilts based
on different release config.

Ignore-AOSP-First: Specific to enabling prebuilts in trunk stable
Bug: 293101517
Test: m (use prebuilts when building next and build from source
when building trunk)

Change-Id: Ie81e033e9d4ac9c0221b796e7e46bcc117ceadbb
 2023-10-05 18:02:23 +00:00
Pranav Gupta
2701f2875b DO NOT MERGE: Enable mainline prebuilts for device targets 
Ignore-AOSP-First: Android Mainline prebuilts are not used for AOSP targets
Bug: 286892268
Test: pre-submit
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:20545fcf21f8af77e5899f7c6ca4837b05dd20f2)
Merged-In: I6f89f47a8e545e563b184cdc9395eddd49950228
Change-Id: I6f89f47a8e545e563b184cdc9395eddd49950228
 2023-10-05 18:00:34 +00:00
Alina Kalyakina
4c5bacd5d9 Merge "Revert "Filter REL out of PLATFORM_VERSION_ALL_CODENAMES."" into main am: 618d848f0d am: 2ea0f6db1f am: 162e7d3a3f am: 0ba8ad6b52 am: 7fec3796ae 
Original change: https://android-review.googlesource.com/c/platform/build/+/2773151

Change-Id: I7c91df1989337d693a2c5cd06924ae2897573a81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-05 12:28:18 +00:00
Alina Kalyakina
162e7d3a3f Merge "Revert "Filter REL out of PLATFORM_VERSION_ALL_CODENAMES."" into main am: 618d848f0d am: 2ea0f6db1f 
Original change: https://android-review.googlesource.com/c/platform/build/+/2773151

Change-Id: Ifcd7e7691663f468ad4dd694ef16afeaf19e07d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-05 10:54:15 +00:00
Alina Kalyakina
2ea0f6db1f Merge "Revert "Filter REL out of PLATFORM_VERSION_ALL_CODENAMES."" into main am: 618d848f0d 
Original change: https://android-review.googlesource.com/c/platform/build/+/2773151

Change-Id: Ibc6f5d1c22c4c86b48f5818235bd61b8974078d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-05 10:24:05 +00:00
Alina Kalyakina
618d848f0d Merge "Revert "Filter REL out of PLATFORM_VERSION_ALL_CODENAMES."" into main 2023-10-05 09:55:37 +00:00
Dan Shi
d637190deb Revert "Filter REL out of PLATFORM_VERSION_ALL_CODENAMES." 
This reverts commit 5346f7db62.

Reason for revert: b/303552537 

Change-Id: I915be23c7d234d28642c141473bf2a180ec4c3c6
 2023-10-05 06:07:52 +00:00
Edward Liaw
0777cb9093 Merge "linux-kselftest: Remove special cased build rule for kselftest" into main am: 41d4b0b3af am: a06534686f am: 6dee758b82 am: fe92cbefdd am: 71fb4d0c46 
Original change: https://android-review.googlesource.com/c/platform/build/+/2736953

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

Change-Id: I6ac13f429e2206b151b446354f97c7f76081b50a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-05 02:50:59 +00:00
Edward Liaw
6dee758b82 Merge "linux-kselftest: Remove special cased build rule for kselftest" into main am: 41d4b0b3af am: a06534686f 
Original change: https://android-review.googlesource.com/c/platform/build/+/2736953

Change-Id: Ibe18437e409e4d2a10a29e3b6b9f8ef6c2b99fbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-05 02:20:54 +00:00
Edward Liaw
a06534686f Merge "linux-kselftest: Remove special cased build rule for kselftest" into main am: 41d4b0b3af 
Original change: https://android-review.googlesource.com/c/platform/build/+/2736953

Change-Id: Ia5a3c3ed37738c58404dc7a9ea78d74bd509ead2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-05 01:48:39 +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
Edward Liaw
41d4b0b3af Merge "linux-kselftest: Remove special cased build rule for kselftest" into main 2023-10-05 01:08:32 +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
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
Ankur Bakshi
aeba1dfb62 Update Security String to 2023-12-05 
Bug: 302612466

Change-Id: I887e3dff893647d8f43ead564887df6f3086381a
Merged-In: I887e3dff893647d8f43ead564887df6f3086381a
Ignore-AOSP-First: Internal first as its needed for preparing the release
 2023-10-04 20:44:51 +00:00
Treehugger Robot
11b548d495 Merge "Use deterministic salt for boot image avb footer" into main am: 2b181f9aa1 am: 006c13c27b am: efc6bdd970 am: 06b5c469ab am: c2a564762c 
Original change: https://android-review.googlesource.com/c/platform/build/+/2768202

Change-Id: Id4f20c8a4726a1efeef04ef2363e94291e2835b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-04 19:52:24 +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
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
Treehugger Robot
2b181f9aa1 Merge "Use deterministic salt for boot image avb footer" into main 2023-10-04 17:08:25 +00:00
Justin Yun
67ae02b768 Merge "Remove PRODUCT_PRODUCT_VNDK_VERSION from soong_config" into main am: f81405aab0 am: a1822c5b6b am: f1942a76cc am: 0b2321aed5 am: b6a2e011c3 
Original change: https://android-review.googlesource.com/c/platform/build/+/2763508

Change-Id: I7d8a9e6e83369fe7b2a51498066e84323c2a9eb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-04 09:27:43 +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
Justin Yun
f81405aab0 Merge "Remove PRODUCT_PRODUCT_VNDK_VERSION from soong_config" into main 2023-10-04 06:29:31 +00:00