From 24c8c12926efc3f11d6bee890c115e6983fbecaf 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
---
 Android.bp               | 2 --
 services/core/Android.bp | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/Android.bp b/Android.bp
index 3fff2d4c39196..2505296d7f8eb 100644
--- a/Android.bp
+++ b/Android.bp
@@ -462,7 +462,6 @@ java_library {
         "framework-statsd-stubs-module_libs_api",
         "framework-permission-stubs-systemapi",
         "framework-wifi-stubs",
-        "ike-stubs",
         "framework-tethering-stubs",
     ],
     installable: true,
@@ -513,7 +512,6 @@ java_library {
         "framework-sdkextensions-stubs-systemapi",
         "framework-statsd-stubs-module_libs_api",
         "framework-wifi-stubs",
-        "ike-stubs",
         "framework-tethering-stubs",
         // TODO (b/147688669) should be framework-telephony-stubs
         "framework-telephony",
diff --git a/services/core/Android.bp b/services/core/Android.bp
index 6fc6084de1818..0df4bd3d0bbac 100644
--- a/services/core/Android.bp
+++ b/services/core/Android.bp
@@ -125,6 +125,7 @@ java_library_static {
         "android.hidl.manager-V1.2-java",
         "dnsresolver_aidl_interface-V2-java",
         "netd_event_listener_interface-java",
+        "ike-stubs",
     ],
 
     plugins: [