Merge "Dynamically include ike-stubs in services.core.unboosted" am: 1586327498 am: 00255195fc

Change-Id: I52aca89b368ec88bb837179aaba43f96bebcea77
2020-02-21 06:45:57 +00:00
parent b413552915 00255195fc
commit 510534da2c
2 changed files with 1 additions and 2 deletions
--- a/Android.bp
+++ b/Android.bp
@@ -456,7 +456,6 @@ java_library {
    defaults: ["framework-defaults"],
    srcs: [":framework-non-updatable-sources"],
    libs: [
-        "ike-stubs",
        "framework-tethering-stubs",
    ],
    installable: true,
@@ -497,7 +496,6 @@ java_library {
        "framework-minus-apex",
        "updatable_media_stubs",
        "framework-sdkextensions-stubs-systemapi",
-        "ike-stubs",
        "framework-tethering-stubs",
    ],
    sdk_version: "core_platform",
--- a/services/core/Android.bp
+++ b/services/core/Android.bp
@@ -54,6 +54,7 @@ java_library_static {
        "android.hidl.manager-V1.2-java",
        "dnsresolver_aidl_interface-V2-java",
        "netd_event_listener_interface-java",
+        "ike-stubs",
    ],
 }