diff options
| author | Yi-yo Chiang <yochiang@google.com> | 2022-10-14 05:41:05 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-10-14 05:41:05 +0000 |
| commit | e1402c390d1079be72ff81060f4a82d153c55ea6 (patch) | |
| tree | 435202b88b249f2d3e55adbf3187b7f64181bf6a | |
| parent | 28720f6fc5ee19bb56a214525b5b6de47ae5d17e (diff) | |
| parent | a60e1259ea3aaccd33e082cb929a8042d26c58ae (diff) | |
| download | common-e1402c390d1079be72ff81060f4a82d153c55ea6.tar.gz | |
Merge "Add virt APEX to arm64 & x86_64 GSI" am: a60e1259ea
Original change: https://android-review.googlesource.com/c/device/generic/common/+/2252335
Change-Id: I0d454a7fa64809f3440eee637ea2c378a2846812
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | gsi_arm64.mk | 3 | ||||
| -rw-r--r-- | gsi_x86_64.mk | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/gsi_arm64.mk b/gsi_arm64.mk index d792cd9..81b0a3e 100644 --- a/gsi_arm64.mk +++ b/gsi_arm64.mk @@ -35,6 +35,9 @@ PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := true # $(call inherit-product, device/generic/common/gsi_system_ext.mk) +# pKVM +$(call inherit-product, packages/modules/Virtualization/apex/product_packages.mk) + # # All components inherited here go to product image # diff --git a/gsi_x86_64.mk b/gsi_x86_64.mk index eb5bd97..b45184c 100644 --- a/gsi_x86_64.mk +++ b/gsi_x86_64.mk @@ -28,6 +28,9 @@ PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := true # $(call inherit-product, device/generic/common/gsi_system_ext.mk) +# pKVM +$(call inherit-product, packages/modules/Virtualization/apex/product_packages.mk) + # # All components below go to product image # |