StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
85,590 Commits 1 Branch 0 Tags
db3c1b173f42cd507bbc6d5b5f30a74aee1ddda4
Commit Graph

33891 Commits

Author SHA1 Message Date
Jooyung Han
db3c1b173f Merge "Remove TARGET_FLATTEN_APEX" into main am: 5d7f9cb2a1 
Original change: https://android-review.googlesource.com/c/platform/build/+/2727593

Change-Id: Ide054683665fe88e04f46f607b7408f1b7ccda01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-28 01:03:27 +00:00
Jooyung Han
5d7f9cb2a1 Merge "Remove TARGET_FLATTEN_APEX" into main 2023-08-28 00:32:35 +00:00
Treehugger Robot
d3cfff21f4 Merge "Fix 16k ota package build failures on pixel" into main am: 8c3bb5b993 
Original change: https://android-review.googlesource.com/c/platform/build/+/2726994

Change-Id: I57108c8b3aabfd4be81b4b986db6abd86e160ef3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 19:47:18 +00:00
Treehugger Robot
8c3bb5b993 Merge "Fix 16k ota package build failures on pixel" into main 2023-08-25 18:50:34 +00:00
Treehugger Robot
2a6a71476b Merge "Use platform built lz4 tool rather than system copy" into main am: 510e0f2cbd 
Original change: https://android-review.googlesource.com/c/platform/build/+/2724254

Change-Id: Ifbb87b7a8740f076075ea3aa1b05fab5326015f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 18:22:51 +00:00
Treehugger Robot
510e0f2cbd Merge "Use platform built lz4 tool rather than system copy" into main 2023-08-25 17:48:13 +00:00
Kelvin Zhang
e9f4ce4368 Fix 16k ota package build failures on pixel 
boot_ota_16k.zip relies on build_boot_from_kernel_avb_enabled. But that
makefile function is guarded by $(BOARD_PREBUILT_BOOTIMAGE). Pixel
defined BOARD_PREBUILT_BOOTIMAGE, which causes
build_boot_from_kernel_avb_enabled to be undefined, resulting in build
failure.

Test: th
Bug: 293313353
Change-Id: I5b01e9bf7fedd9c508f476bc243d860dc48c5ebb
 2023-08-25 10:41:48 -07:00
Jooyung Han
0d500c58aa Remove TARGET_FLATTEN_APEX 
And inherit updatable_apex.mk by default.

Bug: 278826656
Test: presubmit
Change-Id: I3f93608a8750dcd72edc3f9517c70f3490f1a7cd
 2023-08-25 15:06:20 +09:00
Treehugger Robot
695570c064 Merge "Skip building compat files if REL" into main am: b531ccf36e 
Original change: https://android-review.googlesource.com/c/platform/build/+/2724973

Change-Id: I60db50f0f2bb3a09db3793447f5c08ce186df784
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 04:45:29 +00:00
Treehugger Robot
b531ccf36e Merge "Skip building compat files if REL" into main 2023-08-25 04:29:28 +00:00
Inseob Kim
9b2631d11a Skip building compat files if REL 
In release build, we don't need to (and shouldn't) build compat files,
because it doesn't make sense to build compat files for itself.
Currently this didn't happen because REL build only happens on -dev
branches. To support main branch setting REL, filtering out
PLATFORM_SEPOLICY_VERSION from compat versions list.

Bug: 296780580
Test: build with next
Change-Id: Ia5c09a1c9b4209ed82dc66307d57decb4f442477
 2023-08-25 04:29:09 +00:00
Kelvin Zhang
19c36a5ee7 Use platform built lz4 tool rather than system copy 
Test: th
Bug: 293313353
Change-Id: I22d5b6906dfd30f947eaa06d6196cdf560c50722
 2023-08-24 18:10:24 -07:00
Treehugger Robot
c7c9a58f1a Merge "Fix 16K page size kernel config check" into main am: f340bd9c13 
Original change: https://android-review.googlesource.com/c/platform/build/+/2725779

Change-Id: Ibbf56901bd431009ebddca3254e01787ebb7e827
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-24 23:27:47 +00:00
Treehugger Robot
efe267a36e Merge "Add a 16K boot partition OTA target" into main am: f5fa306ea4 
Original change: https://android-review.googlesource.com/c/platform/build/+/2724253

Change-Id: I52a1c19da7b8a5a99c8ae1709c41e6688befb118
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-24 23:27:15 +00:00
Kelvin Zhang
9113badc39 Fix 16K page size kernel config check 
Non 16K kernels might have "CONFIG_ARM64_16K_PAGES is not set" string in
kernel config, properly handle this case.

Test: th
Bug: 293313353
Change-Id: I1a9582503c5fd20b8dcf95406166df7e11940424
 2023-08-24 14:26:23 -07:00
Kelvin Zhang
6257eb2144 Add a 16K boot partition OTA target 
This OTA will be used to switch real devices to 16K kernel

Test: th
Bug: 293313353
Change-Id: I7a5866fd6f7f4ba6646af019386085ea2646c93f
 2023-08-24 13:44:59 -07:00
Treehugger Robot
0d7abde2c0 Merge "Revert "Add BUILD_BROKEN_VENDOR_SEAPP_USES_COREDOMAIN"" into main am: a679e050f5 
Original change: https://android-review.googlesource.com/c/platform/build/+/2722775

Change-Id: I4077056f6a63d150fc51dd38a94610cfcccb33c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-23 07:12:35 +00:00
Treehugger Robot
a679e050f5 Merge "Revert "Add BUILD_BROKEN_VENDOR_SEAPP_USES_COREDOMAIN"" into main 2023-08-23 06:34:31 +00:00
Treehugger Robot
5403b178a8 Merge "Ignore vndk compat symlinks in artifact path requirements" into main am: 99dc0cc49e 
Original change: https://android-review.googlesource.com/c/platform/build/+/2721721

Change-Id: I6432991fbba4be0e4f013478ac353452b94f26d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-23 05:56:36 +00:00
Treehugger Robot
99dc0cc49e Merge "Ignore vndk compat symlinks in artifact path requirements" into main 2023-08-23 05:24:48 +00:00
Inseob Kim
a26d098160 Revert "Add BUILD_BROKEN_VENDOR_SEAPP_USES_COREDOMAIN" 
Revert submission 2715179-BUILD_BROKEN_VENDOR_SEAPP_USES_COREDOMAIN

Reason for revert: not needed

Reverted changes: /q/submissionid:2715179-BUILD_BROKEN_VENDOR_SEAPP_USES_COREDOMAIN

Change-Id: Ib8612049314dbe26a913cc97b8c835fad4f03824
 2023-08-23 02:07:53 +00:00
Cole Faust
075d9622ff Ignore vndk compat symlinks in artifact path requirements 
A change is being made to properly track apex compat symlinks in
the installation logic, which causes the artifact path requirements
to start complaining about them. Exclude them from the artifact path
requirements.

Bug: 205632228
Test: m nothing
Change-Id: Ie975b7450574d41bb13bb2179edc31ba4edd413e
 2023-08-22 11:58:17 -07:00
Treehugger Robot
21280589af Merge "Build a boot image for 16K kernel" into main am: 6a2e73c3bb 
Original change: https://android-review.googlesource.com/c/platform/build/+/2719320

Change-Id: I46a2557ebcea05586d5bc45bd12c1a039101a38f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-22 18:44:31 +00:00
Kelvin Zhang
cde8734295 Build a boot image for 16K kernel 
This image can be used to switch the device to 16K kernel.

Test: th
Bug: 293313353
Change-Id: Iea3ad29e0b3789f0c499004f3f346ab3c460f39e
 2023-08-21 21:05:43 -07:00
Treehugger Robot
013135c684 Merge "Add BUILD_BROKEN_VENDOR_SEAPP_USES_COREDOMAIN" into main am: 0f5090934f 
Original change: https://android-review.googlesource.com/c/platform/build/+/2716817

Change-Id: I458874b2327622847f9a7c0fe06a6452cef36d5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-22 02:55:57 +00:00
Treehugger Robot
0f5090934f Merge "Add BUILD_BROKEN_VENDOR_SEAPP_USES_COREDOMAIN" into main 2023-08-22 02:09:45 +00:00
Treehugger Robot
a865decd76 Merge changes I2920d8b0,I55cd3340 into main am: de9df1dcf6 
Original change: https://android-review.googlesource.com/c/platform/build/+/2717716

Change-Id: Ic2ae64ee5c1ad43cfd2341d41f0d808063aec896
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-21 22:14:51 +00:00
Treehugger Robot
de9df1dcf6 Merge changes I2920d8b0,I55cd3340 into main 
* changes:
  Add 16K ramdisk to vendor_boot
  Move 16K kernel modules to /lib/modules/`uname -r`_16k
 2023-08-21 21:32:02 +00:00
Eran Messeri
e24afe8cfb Merge "Remove the empty property of attestation." into main am: 66832f6525 
Original change: https://android-review.googlesource.com/c/platform/build/+/2711615

Change-Id: I96218b2a21c805a6c193a2f5692100d5d5f2a3b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-21 14:56:45 +00:00
Eran Messeri
66832f6525 Merge "Remove the empty property of attestation." into main 2023-08-21 14:34:49 +00:00
Treehugger Robot
84b3f07b31 Merge "Add dependency for combined aconfig files" into main am: a3cd7dcd29 
Original change: https://android-review.googlesource.com/c/platform/build/+/2717642

Change-Id: Ide1a1cdad902fff2b3385b00f3c047251304dea4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-21 14:23:11 +00:00
Treehugger Robot
a3cd7dcd29 Merge "Add dependency for combined aconfig files" into main 2023-08-21 14:08:00 +00:00
Joe Onorato
b209349689 Add dependency for combined aconfig files 
Bug: 293436986
Test: manual
Change-Id: I1d358faf9a0a3a83a92646c7cf7194c17ad2331e
 2023-08-19 19:03:28 -07:00
Treehugger Robot
9488c6c0ea Merge "Don't check the codename for REL configuration." into main am: 987e6ba3f2 
Original change: https://android-review.googlesource.com/c/platform/build/+/2717722

Change-Id: I7baffb4010a2d8032cd842919e22efd31fe5d316
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-19 23:39:08 +00:00
Alex Buynytskyy
be87e19e67 Don't check the codename for REL configuration. 
Bug: 294161396
Test: m
Change-Id: I905801fdb6520b430f15f219ae4cd89be74065a5
 2023-08-19 00:07:16 +00:00
Kelvin Zhang
b71bc1bcde Add 16K ramdisk to vendor_boot 
Store both 4K and 16K kernel modules in vendor_boot, this allows the
device to switch between two kernels easily.

Test: th
Bug: 293313353
Change-Id: I2920d8b0fe762defe273912efa89bc1b5642fdb2
 2023-08-18 11:09:06 -07:00
Kelvin Zhang
0a1dd239cc Move 16K kernel modules to /lib/modules/uname -r_16k 
Store 16K kernel modules in separate directory. This allows us to store
both 4k and 16k kernel modules in vendor_boot and have init load from
the right path.

Test: th
Bug: 293313353
Change-Id: I55cd33404defc71dfbd350517d2aa51bebdb3d06
 2023-08-18 11:02:19 -07:00
Inseob Kim
30cbf0b853 Add BUILD_BROKEN_VENDOR_SEAPP_USES_COREDOMAIN 
Starting from Android V, vendor seapp_contexts files can't assign
coredomain to vendor apps, as it's Treble violation. This build broken
variable is to suppress the enforcement for devices launching with U or
prior.

Bug: 280547417
Test: set BUILD_BROKEN_VENDOR_SEAPP_USES_COREDOMAIN := true and build
Change-Id: If4035e6cbd0c62a1111241d94ed0a3923f61247b
 2023-08-18 18:13:54 +09:00
Alex Buynytskyy
1f9fe102a4 Merge "Allow PLATFORM_VERSION_CODENAME to be overridden by RELEASE_PLATFORM_VERSION_CODENAME_REL" into main am: 7109fe1822 
Original change: https://android-review.googlesource.com/c/platform/build/+/2657941

Change-Id: I1c6fee0ce48bcecfe07d1e8f236629cfd8360da9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 22:14:25 +00:00
Alex Buynytskyy
7109fe1822 Merge "Allow PLATFORM_VERSION_CODENAME to be overridden by RELEASE_PLATFORM_VERSION_CODENAME_REL" into main 2023-08-16 21:27:21 +00:00
wufei3
99fafaec22 Remove the empty property of attestation. 
In GSI images attestation specific properties
(ro.product.*_for_attestation) are empty, which causes attestation
failure on devices with different values in ro.product.* and
ro.product.vendor.* from actual values provisioned in Keymint.

Hence these values added only if they are set in build files.

Bug:294190893
Test: atest CtsKeystoreTestCases:android.keystore.cts.DeviceOwnerKeyManagementTest#testAllVariationsOfDeviceIdAttestation

Change-Id: Icaf1bcd089767b2c47d0b57064aa72a4c9483bb5
Signed-off-by: wufei3 <wufei3@xiaomi.corp-partner.google.com>
 2023-08-16 15:39:29 +00:00
Jared Duke
69e90745fa Merge "Add global rule for -keepattributes Exceptions" into main am: 7e730893f1 
Original change: https://android-review.googlesource.com/c/platform/build/+/2707402

Change-Id: I264c182195f468ffdd86dcdf0049336a08da4160
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-15 18:33:18 +00:00
Jared Duke
7e730893f1 Merge "Add global rule for -keepattributes Exceptions" into main 2023-08-15 17:45:57 +00:00
Jared Duke
3f2741215f Add global rule for -keepattributes Exceptions 
R8 full mode requires an explicit keep rule for keeping attributes for a
given target (class/method/member). As such, we can set the global rule
for keeping these attributes with minimal cost while reducing the
maintenance burden for adding incremental keep rules.

For a typical Android build, this adds <20KB total to the image.

Bug: 215530220
Test: m
Change-Id: Iad3de32e27da0ca93b618d8a203ee65bae0bb5d1
 2023-08-15 15:48:35 +00:00
Ming-Chen Chung
08f1636468 Merge "Add update_device to be built and be packaged into otatools.zip." into main am: c2038e8e3d 
Original change: https://android-review.googlesource.com/c/platform/build/+/2704353

Change-Id: I9d0cc91aa4827b4d50ccc49a29d355d86e95c4ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-15 02:57:44 +00:00
Ming-Chen Chung
c2038e8e3d Merge "Add update_device to be built and be packaged into otatools.zip." into main 2023-08-15 01:55:05 +00:00
Cole Faust
175b8f244d Merge "Rename some variables in definitions.mk" into main am: 26acac7287 
Original change: https://android-review.googlesource.com/c/platform/build/+/2708513

Change-Id: Idfa2d255724d5b21e480e476aa3da6855713596e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-15 01:06:15 +00:00
Cole Faust
8e4024c872 Rename some variables in definitions.mk 
Sublime text has an issue with their syntax highlighting, where it
looks for \s*define\b to indicate the start of a define block.
We had some variables that started with "define-", which match this
regex, which causes Sublime to be confused about where the defines
start and end. Rename the variables to work around this issue.

Test: m nothing
Change-Id: I997929606e2b0a8b086ad3b67a7ce1b5e99a7385
 2023-08-14 15:28:05 -07:00
Joe Onorato
773e746119 Merge "Give an error when trying to build "next" targets" into main am: 23a778b361 
Original change: https://android-review.googlesource.com/c/platform/build/+/2703313

Change-Id: Ib224b23c64038453e52456696c4e900453a00b9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-14 21:48:05 +00:00
Joe Onorato
23a778b361 Merge "Give an error when trying to build "next" targets" into main 2023-08-14 20:59:03 +00:00