commit 68349c376aad5930db743afc038023ea7ee78a7e
author Nikita Ioffe <ioffe@google.com> Fri Nov 18 20:36:47 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Nov 18 20:36:47 2022 +0000
tree b79cfe9374cdb792875089a0efdc7e5794c265fd
parent 5732cd72fdec87dabc525c46730084ffba61d95f
parent 828245507fdd5118c67b3f337a2740fa06d59afb

Merge "Put libvirtualmachine_jni in all variants of virt APEX" am: be0e1f8152 am: 8526b7c4b7 am: 828245507f

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/2309007

Change-Id: Iac68d10aec93277c92b475fe6b1a957067ba21df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

apex/Android.bp

diff --git a/apex/Android.bp b/apex/Android.bp
index 2d6c757..4e64e50 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -57,6 +57,9 @@
     bootclasspath_fragments: [
         "com.android.virt-bootclasspath-fragment",
     ],
+    jni_libs: [
+        "libvirtualmachine_jni",
+    ],
 }
 
 apex_defaults {
@@ -87,9 +90,6 @@
         "fd_server",
         "vm",
     ],
-    jni_libs: [
-        "libvirtualmachine_jni",
-    ],
     prebuilts: [
         "com.android.virt.init.rc",
         "features_com.android.virt.xml",