Merge "Do not statically link ike-stubs"

2020-02-25 22:05:37 +00:00
parent a7fdceeba2 5fc0bbaae7
commit d63c9d71b1
3 changed files with 5 additions and 1 deletions
--- a/services/core/Android.bp
+++ b/services/core/Android.bp
@@ -30,6 +30,7 @@ java_library_static {
        "android.hardware.vibrator-java",
        "app-compat-annotations",
        "framework-tethering-stubs",
+        "ike-stubs",
    ],

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

--- 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"],
 }

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