Commit Graph

89516 Commits

Author SHA1 Message Date
Treehugger Robot
0f5090934f Merge "Add BUILD_BROKEN_VENDOR_SEAPP_USES_COREDOMAIN" into main 2023-08-22 02:09:45 +00:00
Chun-Yi Lee
ed72d33a9a Revert "Ignore vndk compat symlinks in artifact path requirements"
Revert submission 2718295-colefaust_track_apex_compat_symlinks

Reason for revert: To validate if this change is causing the build breakage.

Reverted changes: /q/submissionid:2718295-colefaust_track_apex_compat_symlinks

Change-Id: I781cd6869daaf5931c5fabb5ca109502b1b52b3e
2023-08-22 01:18:51 +00:00
Cole Faust
1b107d4b5f Merge "Ignore vndk compat symlinks in artifact path requirements" into main am: 303e0450a6
Original change: https://android-review.googlesource.com/c/platform/build/+/2719916

Change-Id: I6c0f11717ecf654b8060fb87aea35ee2ad4cf441
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 22:15:24 +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
Cole Faust
303e0450a6 Merge "Ignore vndk compat symlinks in artifact path requirements" into main 2023-08-21 21:54:37 +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
Cole Faust
f7554e3735 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: I46150c3b7a4eaac16c2daa80fec2a5640e32b61b
2023-08-21 11:47:39 -07: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
Kangping Dong
1fb1dd701c Revert "add com.android.threadnetwork to base_system.mk"
This reverts commit 286e55ad94.

Reason for revert: the com.android.threadnetwork module is merged to com.android.tethering module

Bug: 296211911
Change-Id: Id601ab8b6f160d8fc2b7a9720652842cc2c194ba
2023-08-22 00:51:40 +08: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
Yihan Dong
c2b7632423 Create the TEST_MAPPING file
Add FlagMacrosTests in presubmit to ensure that test filtering rule
always work as expected.

Bug: 292707070
Test: atest --test-mapping
Change-Id: I7a08b7e41e95063fb3c188da784f56e0973d4fae
2023-08-21 17:23:14 +08: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
Android Build Coastguard Worker
69a4f81be8 Version bump to UP1A.230905.019 [core/build_id.mk]
Change-Id: I3f97b4ec14d6c9f30bc9aa8691e7f3207e94539b
2023-08-20 07:07:20 +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
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
Android Build Coastguard Worker
d5f377693a [coastguard skipped] Merge sparse cherrypicks from sparse-10644925-L08900000962649037 into udc-release.
COASTGUARD_SKIP: Iea16f3e7f7b10bc0a6eb05e40cfcc9788899fe98

Change-Id: Ice787c445e6212dbb894940f6e06d425716484d3
2023-08-18 19:56:32 +00:00
Android Build Coastguard Worker
11526dd437 Version bump to UP1A.230905.016.Z1 [core/build_id.mk]
Change-Id: Iea16f3e7f7b10bc0a6eb05e40cfcc9788899fe98
2023-08-18 19:52:46 +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
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
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
Android Build Coastguard Worker
c5226f9dfe [coastguard skipped] Merge sparse cherrypicks from sparse-10644925-L49500000962635927 into udc-release.
COASTGUARD_SKIP: I3e55c0e8cb02a2ef02c906ad55a7508279eb4a20

Change-Id: I20cd56b4986b805a99c25c4b73c15cdc4d9e1361
2023-08-17 23:11:45 +00:00
Android Build Coastguard Worker
3247564708 Version bump to UP1A.230905.016.Y1 [core/build_id.mk]
Change-Id: I3e55c0e8cb02a2ef02c906ad55a7508279eb4a20
2023-08-17 23:07:13 +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
Android Build Coastguard Worker
0f69434139 [coastguard skipped] Merge sparse cherrypicks from sparse-10644925-L51500000962610728 into udc-release.
COASTGUARD_SKIP: I36cab24870f260f42e65ea3a015136ca2545f191

Change-Id: Icab2597764a1793b7be9b1d1a53e72a06b39bce2
2023-08-17 01:19:57 +00:00
Android Build Coastguard Worker
5f5a4dfc83 Version bump to UP1A.230905.016.X1 [core/build_id.mk]
Change-Id: I36cab24870f260f42e65ea3a015136ca2545f191
2023-08-17 01:15:02 +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
Kangping Dong
53adc11e69 Revert "add service-threadnetwork to system_server jars"
This reverts commit a1a7046533.

Reason for revert: the com.android.threadnetwork module is merged to com.android.tethering module

Bug: 296211911
Change-Id: I33195990307715315a3877910de0cf4582399d6c
2023-08-16 13:56:57 +00:00
Android Build Coastguard Worker
adc22d51f9 [coastguard skipped] Merge sparse cherrypicks from sparse-10656816-L22800000962596462 into udc-release.
COASTGUARD_SKIP: Ia79f5642cf8dc4e8bb572e45a5162772493167d1

Change-Id: Ia13ed8d3323f4ac3c99b7bad3ad3658264581adf
2023-08-16 00:34:16 +00:00
Android Build Coastguard Worker
84b2c1db1b Version bump to UP1A.230905.018.A2 [core/build_id.mk]
Change-Id: Ia79f5642cf8dc4e8bb572e45a5162772493167d1
2023-08-16 00:29:48 +00:00
Android Build Coastguard Worker
49cd7615f2 [coastguard skipped] Merge sparse cherrypicks from sparse-10645071-L87800000962584362 into udc-release.
COASTGUARD_SKIP: Idfe9de1d3ed702490aa83a2b51cd81bfaa42fe49

Change-Id: Ifeb109aa5d6c22488533e795b310af7c7d9de28d
2023-08-15 22:43:02 +00:00