commit b6e4f1db32a3b65de418652e05c8c247c72072b0
author Seungjae Yoo <seungjaeyoo@google.com> Mon Jun 17 15:13:12 2024 +0900
committer Seungjae Yoo <seungjaeyoo@google.com> Wed Jun 19 10:26:48 2024 +0900
tree 64ca6d0c0a856e521bcc697e4c7b25e591c71ee4
parent 8808313b1382b203e4a3fb28c0363390ad6daef6

Skeleton for IVmTethering service with flag guarding

This reverts commit f9676878292a49caa03e5270c3be2769b029db60.

Bug: 340376953
Test: adb shell /apex/com.android.virt/bin/vm run-microdroid --network-supported

Change-Id: I9c859dd43e7ba7c852a71afce8f36ca10477ad24

apex/Android.bp

diff --git a/apex/Android.bp b/apex/Android.bp
index 17b1f9e..8a53a3d 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -89,6 +89,7 @@
     ],
     jni_libs: [
         "libvirtualizationservice_jni",
+        "libvirtualizationsystemservice_jni",
         "libvirtualmachine_jni",
     ],
     // TODO(b/295593640) Unfortunately these are added to the apex even though they are unused.

apex/product_packages.mk

diff --git a/apex/product_packages.mk b/apex/product_packages.mk
index a318817..486334c 100644
--- a/apex/product_packages.mk
+++ b/apex/product_packages.mk
@@ -56,3 +56,9 @@
     $(error RELEASE_AVF_ENABLE_DICE_CHANGES must also be enabled)
   endif
 endif
+
+ifdef RELEASE_AVF_ENABLE_NETWORK
+  ifndef RELEASE_AVF_ENABLE_LLPVM_CHANGES
+    $(error RELEASE_AVF_ENABLE_LLPVM_CHANGES must also be enabled)
+  endif
+endif