| commit | 8ad42120f0ab18227b3fa821229c29002d94e325 | [log] [tgz] |
|---|---|---|
| author | Nikita Ioffe <ioffe@google.com> | Fri Mar 24 13:44:02 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Mar 24 13:44:02 2023 +0000 |
| tree | cc7cdac323112701b572d7450a485e9e5ec448e8 | |
| parent | f2c41f17e92e3626f8b1c80e15f4eb54cf5d4609 [diff] | |
| parent | cac60c47cf57d2d5286f5406b9dcef6d9ca20658 [diff] |
Merge changes I8007849d,Ia8d589f5 am: cac60c47cf Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/2505879 Change-Id: I840d70fbc403f56870972ebe311c79f8312cd69c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/apex/product_packages.mk b/apex/product_packages.mk index 4293c80..ef84551 100644 --- a/apex/product_packages.mk +++ b/apex/product_packages.mk
@@ -19,6 +19,9 @@ # To include the APEX in your build, insert this in your device.mk: # $(call inherit-product, packages/modules/Virtualization/apex/product_packages.mk) +# If devices supports AVF it implies that it uses non-flattened APEXes. +$(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk) + PRODUCT_PACKAGES += \ com.android.compos \
diff --git a/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java b/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java index 542f595..d8e80dd 100644 --- a/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java +++ b/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java
@@ -635,6 +635,14 @@ @Test @CddTest(requirements = {"9.17/C-1-1"}) + public void testAvfRequiresUpdatableApex() throws Exception { + assertWithMessage("Devices that support AVF must also support updatable APEX") + .that(SystemProperties.getBoolean("ro.apex.updatable", false)) + .isTrue(); + } + + @Test + @CddTest(requirements = {"9.17/C-1-1"}) public void vmmGetAndCreate() throws Exception { assumeSupportedDevice();