Commit 24c8c129 authored Feb 07, 2020 by evitayan

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

parent daeb328e

Android.bp

+0 −2

Original line number	Diff line number	Diff line
		@@ -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",

services/core/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -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: [