Merge "Do not statically link ike-stubs" am: d63c9d71b1 am: c3f22ed19d

Change-Id: Ied6a4dce96361e231ee1661dbb1eb1155ca36a75
2020-02-25 22:37:46 +00:00
parent 0d244fe4aa c3f22ed19d
commit eaa73fd3ea
3 changed files with 5 additions and 1 deletions
--- a/services/core/Android.bp
+++ b/services/core/Android.bp
@@ -99,6 +99,7 @@ java_library_static {
        "android.hardware.vibrator-java",
        "app-compat-annotations",
        "framework-tethering-stubs",
+        "ike-stubs",
    ],

    required: [
@@ -126,7 +127,6 @@ java_library_static {
        "android.hidl.manager-V1.2-java",
        "dnsresolver_aidl_interface-V2-java",
        "netd_event_listener_interface-java",
-        "ike-stubs",
    ],

    plugins: [
--- a/services/robotests/Android.bp
+++ b/services/robotests/Android.bp
@@ -26,6 +26,8 @@ android_app {
        "services.core",
        "services.net",
    ],
+
+    libs: ["ike-stubs"],
 }

 //##################################################################
--- a/services/robotests/backup/Android.bp
+++ b/services/robotests/backup/Android.bp
@@ -28,6 +28,8 @@ android_app {
        "services.core",
        "services.net",
    ],
+
+    libs: ["ike-stubs"],
 }

 //##################################################################