From 78ed90270af7950d7e9a5b5481dc49ef1adbc1c3 Mon Sep 17 00:00:00 2001
From: evitayan <evitayan@google.com>
Date: Fri, 7 Feb 2020 11:34:50 -0800
Subject: [PATCH] Dynamically include ike-stubs in services.core.unboosted

Previously because compilation will preferentially uses the
ike-stubs statically included in framework.jar,
FrameworksIkeTests has to jarjar the ike_test.jar. Otherwise
the tests will use the ike-stubs and cannot access to the hidden
implementation.

This commit removes ike-stubs in framework-minus-apex and framework
and statically includes it in services.core.unboosted.

In this way, system server can still compile against ike.jar and
at the same time FrameworksIkeTests does not need to jarjar the
ike_test.jar anymore

Bug: 145995723
Test: build, flash, boot, loaded in system server
Test: atest FramewokrsIkeTests (passed)
Test: m mts && mts-tradefed run mts-ipsec (passed)
Change-Id: I75dabcc522e89c94c3e888f5cea22ad5ce0a77e5
Merged-In: I75dabcc522e89c94c3e888f5cea22ad5ce0a77e5
---
 Android.bp               | 2 --
 services/core/Android.bp | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/Android.bp b/Android.bp
index 5224348621b5a..84f3fad7306b0 100644
--- 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",
diff --git a/services/core/Android.bp b/services/core/Android.bp
index 40992b9286d35..a09063bc81b00 100644
--- 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",
     ],
 }