Merge "Do not statically link ike-stubs" into rvc-dev

2020-02-26 03:08:59 +00:00
parent da043aee24 d713db92a5
commit 969da7c894
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"],
 }

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