Commit graph

91042 commits

Author SHA1 Message Date
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
a13966114b Merge "Don't check the codename for REL configuration." into main am: 987e6ba3f2 am: 9488c6c0ea am: ba0e5d4f76 am: f9b8392ee3 am: beabe0f42f
Original change: https://android-review.googlesource.com/c/platform/build/+/2717722

Change-Id: I362409c5b9f93cdcb7ca20ccd79781acf02e60b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-20 01:55:15 +00:00
Treehugger Robot
beabe0f42f Merge "Don't check the codename for REL configuration." into main am: 987e6ba3f2 am: 9488c6c0ea am: ba0e5d4f76 am: f9b8392ee3
Original change: https://android-review.googlesource.com/c/platform/build/+/2717722

Change-Id: I0fd74a3716b81f5f339f0c80c747a2af5de228c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-20 01:11:57 +00:00
Treehugger Robot
f9b8392ee3 Merge "Don't check the codename for REL configuration." into main am: 987e6ba3f2 am: 9488c6c0ea am: ba0e5d4f76
Original change: https://android-review.googlesource.com/c/platform/build/+/2717722

Change-Id: Ib1a25de41ad908cfb3b8b7cef4b5d4b08e866d93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-20 00:45:46 +00:00
Treehugger Robot
ba0e5d4f76 Merge "Don't check the codename for REL configuration." into main am: 987e6ba3f2 am: 9488c6c0ea
Original change: https://android-review.googlesource.com/c/platform/build/+/2717722

Change-Id: I5087fc66f4e5b3a9b49456760b7113e4ab03a2d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-20 00:13:32 +00: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
f55a1dd3b3 Merge "Ignore invalid vndk snapshot versions" into main am: 4a35600b7f am: cb3170eda4 am: bcb65cbfca am: cbc1f8abe3 am: 5f1a89be6e
Original change: https://android-review.googlesource.com/c/platform/build/+/2715737

Change-Id: I38b277180fd3921ff7b091222a51cb40758bdfeb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-18 20:13:29 +00:00
Alex Buynytskyy
5f1a89be6e Merge "Ignore invalid vndk snapshot versions" into main am: 4a35600b7f am: cb3170eda4 am: bcb65cbfca am: cbc1f8abe3
Original change: https://android-review.googlesource.com/c/platform/build/+/2715737

Change-Id: I330c2423d3f130ab00e47e095a6ec6f33c4603cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-18 19:35:14 +00:00
Alex Buynytskyy
cbc1f8abe3 Merge "Ignore invalid vndk snapshot versions" into main am: 4a35600b7f am: cb3170eda4 am: bcb65cbfca
Original change: https://android-review.googlesource.com/c/platform/build/+/2715737

Change-Id: Idef2769f808e38e2a76868f27f9c772b5ea393e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-18 19:12:29 +00:00
Alex Buynytskyy
bcb65cbfca Merge "Ignore invalid vndk snapshot versions" into main am: 4a35600b7f am: cb3170eda4
Original change: https://android-review.googlesource.com/c/platform/build/+/2715737

Change-Id: I87bf7f14bd5a543f091445c70c54af16ad1db494
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-18 18:41:04 +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
693ab618d8 Merge "Install llndk.libraries.txt when VNDK is deprecated" into main am: 9ef5b821a0 am: 436be9e9b6 am: b6ab50cf54 am: 905077736c am: e7a9c2e7e1
Original change: https://android-review.googlesource.com/c/platform/build/+/2702834

Change-Id: I9b0a6e00925f7d26049e1b21a39fbbf2f6122bc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-18 17:39:19 +00:00
Treehugger Robot
e7a9c2e7e1 Merge "Install llndk.libraries.txt when VNDK is deprecated" into main am: 9ef5b821a0 am: 436be9e9b6 am: b6ab50cf54 am: 905077736c
Original change: https://android-review.googlesource.com/c/platform/build/+/2702834

Change-Id: I87f7d244fdb16bd96d9ff73417abe55ebfd01a5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-18 17:30:16 +00:00
Treehugger Robot
905077736c Merge "Install llndk.libraries.txt when VNDK is deprecated" into main am: 9ef5b821a0 am: 436be9e9b6 am: b6ab50cf54
Original change: https://android-review.googlesource.com/c/platform/build/+/2702834

Change-Id: I6caf2372333b4fb7dba0b633860ba84cb1164092
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-18 17:07:10 +00:00
Jigar Thakkar
68d3deca75 Merge "Prevent pre-installation of platform apps on private space" into main 2023-08-18 16:52:01 +00:00
Treehugger Robot
b6ab50cf54 Merge "Install llndk.libraries.txt when VNDK is deprecated" into main am: 9ef5b821a0 am: 436be9e9b6
Original change: https://android-review.googlesource.com/c/platform/build/+/2702834

Change-Id: Ifccd4ed06c290e1125e13ea560cf613fc4a4aec4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-18 16:38:55 +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
Kelvin Zhang
b283324985 [automerger skipped] Check device's launch API level before using new compresison algo am: 201cb593f4 -s ours am: 517872677d -s ours
am skip reason: Merged-In I82fdf788e47e2a6daeaa4479bfecf317d8ebb5d5 with SHA-1 8f83000732 is already in history

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

Change-Id: I02467ce95529f2f17b39cbb43e9b1b9db8a96412
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 22:22:10 +00:00
Kelvin Zhang
517872677d [automerger skipped] Check device's launch API level before using new compresison algo am: 201cb593f4 -s ours
am skip reason: Merged-In I82fdf788e47e2a6daeaa4479bfecf317d8ebb5d5 with SHA-1 8f83000732 is already in history

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

Change-Id: I43488ead59ebe6a04274be68e6a7329d026403e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 21:56:08 +00:00
Kelvin Zhang
201cb593f4 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
Bug: 291594891
Test: generate full OTA for T launched devices, make sure lz4 is not
used
(cherry picked from https://android-review.googlesource.com/q/commit:8f830007321ef0cbabd5f581da5a6429843ff399)

Merged-In: I82fdf788e47e2a6daeaa4479bfecf317d8ebb5d5
Change-Id: I82fdf788e47e2a6daeaa4479bfecf317d8ebb5d5
2023-08-17 13:01:22 -07:00
Vinh Tran
a2e7dae501 Merge changes from topic "rust_aconfig-test-mode" into main am: 73b4f2d4e2 am: 31fdd70294 am: 20288ab1cd am: e17aa8ad16 am: b213bccfbd
Original change: https://android-review.googlesource.com/c/platform/build/+/2706433

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

Change-Id: I71c7befa3628631ebd9c4be3c98e04b0e332c990
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 17:11:22 +00:00
Vinh Tran
b213bccfbd Merge changes from topic "rust_aconfig-test-mode" into main am: 73b4f2d4e2 am: 31fdd70294 am: 20288ab1cd am: e17aa8ad16
Original change: https://android-review.googlesource.com/c/platform/build/+/2706433

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

Change-Id: Id3165849da656711a99dce6a376590e0f91357c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 16:41:47 +00:00
Vinh Tran
e17aa8ad16 Merge changes from topic "rust_aconfig-test-mode" into main am: 73b4f2d4e2 am: 31fdd70294 am: 20288ab1cd
Original change: https://android-review.googlesource.com/c/platform/build/+/2706433

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

Change-Id: Ibadca3e3cfa60efced6e0c7b3b4fc06c584f42a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 16:20:17 +00:00
Vinh Tran
20288ab1cd Merge changes from topic "rust_aconfig-test-mode" into main am: 73b4f2d4e2 am: 31fdd70294
Original change: https://android-review.googlesource.com/c/platform/build/+/2706433

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

Change-Id: Id2d8b4872dece1540ca1cf6601bdc80205e7de4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 15:53:51 +00: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
ee5fc6ba8f Merge "Check device's launch API level before using new compresison algo" into main am: ef9ba4d22b am: ff61f45ab0 am: fb065c0233 am: d17eca4c1f am: 6a53c27e33
Original change: https://android-review.googlesource.com/c/platform/build/+/2712853

Change-Id: Id6d28ce96371c578efa8ce40b258d92e52501601
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 04:32:32 +00:00
Treehugger Robot
6a53c27e33 Merge "Check device's launch API level before using new compresison algo" into main am: ef9ba4d22b am: ff61f45ab0 am: fb065c0233 am: d17eca4c1f
Original change: https://android-review.googlesource.com/c/platform/build/+/2712853

Change-Id: I4d3987b5786714a3bde19f70d5f8fcc1c46b582e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 03:49:09 +00:00
Treehugger Robot
d17eca4c1f Merge "Check device's launch API level before using new compresison algo" into main am: ef9ba4d22b am: ff61f45ab0 am: fb065c0233
Original change: https://android-review.googlesource.com/c/platform/build/+/2712853

Change-Id: Ib6fbfe64f4a067061e832c10c86c6004dc8ca24e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 03:04:59 +00:00
Treehugger Robot
fb065c0233 Merge "Check device's launch API level before using new compresison algo" into main am: ef9ba4d22b am: ff61f45ab0
Original change: https://android-review.googlesource.com/c/platform/build/+/2712853

Change-Id: If31e95122a1821b120eb4070b335c99e3c12b899
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 02:19:56 +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
Yu Liu
6509d6b09e [automerger skipped] Merge "Add device-tests as a dep of JACOCO_REPORT_CLASSES_ALL." into udc-dev am: c31092cbb0 am: 0b2d944d93 am: 421f5836b7 -s ours am: 44b6771661 -s ours
am skip reason: Merged-In Id201bda1bd4acfc6cadada982e20dee19d8c703a with SHA-1 5101ccd905 is already in history

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

Change-Id: I3800c4e9a7f4e47664c66a23949c668bee4be95c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 00:03:12 +00:00
Alex Buynytskyy
32059b7cdc Merge "Allow PLATFORM_VERSION_CODENAME to be overridden by RELEASE_PLATFORM_VERSION_CODENAME_REL" into main am: 7109fe1822 am: 1f9fe102a4 am: f1ff31c714 am: 3b917fd49e am: 3b52120fee
Original change: https://android-review.googlesource.com/c/platform/build/+/2657941

Change-Id: I30a4104d3426cba1739c678f2b8aa5247f23c774
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 00:02:30 +00:00