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

85520 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Treehugger Robot
a0bfc6a05e Merge "Add a fake library that contains the minimum DeviceConfig that aconfig code needs to compile." into main am: f7171f4dff 
Original change: https://android-review.googlesource.com/c/platform/build/+/2718434

Change-Id: Ibcacfc6230a0fdef46e4662c79faa4b2ee6adb52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-21 17:09:13 +00:00
Treehugger Robot
f7171f4dff Merge "Add a fake library that contains the minimum DeviceConfig that aconfig code needs to compile." into main 2023-08-21 16:30:53 +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
03d53f7d2d Add a fake library that contains the minimum DeviceConfig that aconfig code needs to compile. 
The aconfig-generated code in the framework is added with srcjars. To
get those srcjars, we still need a java_aconfig_library.  This class is
there to allow that to compile, even though those compiled .jar files
are not actually used.

Bug: 293195086
Test: m
Change-Id: I34c21925fbc5912a34fea3e7796d5e0c77c9a4af
 2023-08-20 07:40:44 -07: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
Treehugger Robot
987e6ba3f2 Merge "Don't check the codename for REL configuration." into main 2023-08-19 23:22:44 +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
Alex Buynytskyy
cb3170eda4 Merge "Ignore invalid vndk snapshot versions" into main am: 4a35600b7f 
Original change: https://android-review.googlesource.com/c/platform/build/+/2715737

Change-Id: If91f6692ebd555b718bb013dbad1dd7cae8a79a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-18 18:09:39 +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
Alex Buynytskyy
4a35600b7f Merge "Ignore invalid vndk snapshot versions" into main 2023-08-18 17:51:23 +00:00
Treehugger Robot
436be9e9b6 Merge "Install llndk.libraries.txt when VNDK is deprecated" into main am: 9ef5b821a0 
Original change: https://android-review.googlesource.com/c/platform/build/+/2702834

Change-Id: I55c06c07ac0d4ce7306cdbf03d903a2b99dc51cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-18 16:05:24 +00:00
Treehugger Robot
9ef5b821a0 Merge "Install llndk.libraries.txt when VNDK is deprecated" into main 2023-08-18 15:24:37 +00:00
Justin Yun
a5e5151af8 Ignore invalid vndk snapshot versions 
Device targets may set PRODUCT_EXTRA_VNDK_VERSIONS to include invalid
snapshot versions with the trunk-stable next configuration.
Ignore those versions that are less than or equal to the
PLATFORM_VNDK_VERSION.

Bug: 296488609
Test: lunch cf_x86_64_phone-next-userdebug; m nothing
Change-Id: I2ba9d7f41a0d75db034b1c08d15f2796ef9ed506
 2023-08-18 17:59:04 +09:00
Vinh Tran
31fdd70294 Merge changes from topic "rust_aconfig-test-mode" into main am: 73b4f2d4e2 
Original change: https://android-review.googlesource.com/c/platform/build/+/2706433

Change-Id: Ifb5291706cc77fbad3d8513914f92c42c836f7ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 15:27:01 +00:00
Dennis Shen
76c6b4d747 Merge "Update codegen to use single channel in sys prop" into main am: f3ef7363a2 
Original change: https://android-review.googlesource.com/c/platform/build/+/2712014

Change-Id: Ia0f2d93e407b2b539e00cfe6b8f057f207dff11b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 15:26:21 +00:00
Vinh Tran
73b4f2d4e2 Merge changes from topic "rust_aconfig-test-mode" into main 
* changes:
  Add rust_test with rust_aconfig_library in test mode
  Fix rust aconfig test
 2023-08-17 14:48:37 +00:00
Dennis Shen
f3ef7363a2 Merge "Update codegen to use single channel in sys prop" into main 2023-08-17 14:29:06 +00:00
Dennis Shen
b352b9d33f Update codegen to use single channel in sys prop 
Update sys prop name from persist.device_config.<namespace>.<flag> to persist.aconfig_flags.aconfig_flags.<namespace>.<flag>

Bug: b/295379636
Change-Id: I78f00daa574dc016902dce4b9b4ec961f973693c
 2023-08-17 13:48:42 +00:00
Treehugger Robot
ff61f45ab0 Merge "Check device's launch API level before using new compresison algo" into main am: ef9ba4d22b 
Original change: https://android-review.googlesource.com/c/platform/build/+/2712853

Change-Id: I366ea4736621ae474ed8bda0a6aaa021146ee12a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-17 01:12:46 +00:00
Treehugger Robot
ef9ba4d22b Merge "Check device's launch API level before using new compresison algo" into main 2023-08-17 00:35:36 +00: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
Kelvin Zhang
8f83000732 Check device's launch API level before using new compresison algo 
If a T launch device later changes to LZ4(which is supported since U),
we will fallback to older compression algorithms, because if the full
OTA is applied on an T build, the update_engine on device won't support
lz4.

Bug: 295989519
Test: generate full OTA for T launched devices, make sure lz4 is not
used

Change-Id: I82fdf788e47e2a6daeaa4479bfecf317d8ebb5d5
 2023-08-16 13:16:48 -07: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
26acac7287 Merge "Rename some variables in definitions.mk" into main 2023-08-15 00:30: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
Juan Yescas
6c8e80a8c2 Merge "core: ARM 32-bit targets must be built with 4k elf alignment" into main am: dfa43734ac 
Original change: https://android-review.googlesource.com/c/platform/build/+/2705856

Change-Id: I21608557356122b16c4589c8bd4359e4df351562
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-14 17:59:39 +00:00
Juan Yescas
dfa43734ac Merge "core: ARM 32-bit targets must be built with 4k elf alignment" into main 2023-08-14 17:56:55 +00:00
Treehugger Robot
3aca2727b8 Merge "Makefile: Avoid packaging pvmfw.bin in /system" into main am: 66f7958fbf 
Original change: https://android-review.googlesource.com/c/platform/build/+/2687888

Change-Id: Id01aedc47d59e056f98c51a2530dd5e6a177228c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-14 17:14:20 +00:00
Treehugger Robot
66f7958fbf Merge "Makefile: Avoid packaging pvmfw.bin in /system" into main 2023-08-14 16:04:20 +00:00
Zhi Dou
22419904dd Merge "aconfig: add default-permission argument for create-cache command" into main am: 5f81b7dc96 
Original change: https://android-review.googlesource.com/c/platform/build/+/2704155

Change-Id: I02694c4afa2e208baddb9ba80d04297bccb7674a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-14 14:59:34 +00:00
Zhi Dou
5f81b7dc96 Merge "aconfig: add default-permission argument for create-cache command" into main 2023-08-14 14:12:27 +00:00
Yu Liu
ea453c2c8d Merge "Add device-tests as a dep of JACOCO_REPORT_CLASSES_ALL." into main am: 50b31493f7 
Original change: https://android-review.googlesource.com/c/platform/build/+/2705814

Change-Id: I80ec586bb2aaf0f074754dbd7587f6bf9c88b7a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-11 22:26:58 +00:00
Vinh Tran
906405f5c9 Add rust_test with rust_aconfig_library in test mode 
Using test mode in aconfig  allows us to override the flag for unit
testing

Test: atest aconfig.test_mode.test.rust
Change-Id: I890fb20fd8cf83e6033defc7093430e3a77e4de4
 2023-08-11 21:41:13 +00:00
Yu Liu
50b31493f7 Merge "Add device-tests as a dep of JACOCO_REPORT_CLASSES_ALL." into main 2023-08-11 21:40:01 +00:00