Do not statically link ike-stubs
Stub jars should not be in statically linked except for inside
other stub jars.
Bug: 145995723
Test: build, flash and reboot
Test: FrameworksIkeTests, FrameworksNetTests
Change-Id: I503616de0143cc39dd189ae689de3e8d77c345da
Merged-In: I503616de0143cc39dd189ae689de3e8d77c345da
(cherry picked from commit 5fc0bbaae7)
This commit is contained in:
@@ -99,6 +99,7 @@ java_library_static {
|
|||||||
"android.hardware.vibrator-java",
|
"android.hardware.vibrator-java",
|
||||||
"app-compat-annotations",
|
"app-compat-annotations",
|
||||||
"framework-tethering-stubs",
|
"framework-tethering-stubs",
|
||||||
|
"ike-stubs",
|
||||||
],
|
],
|
||||||
|
|
||||||
required: [
|
required: [
|
||||||
@@ -126,7 +127,6 @@ java_library_static {
|
|||||||
"android.hidl.manager-V1.2-java",
|
"android.hidl.manager-V1.2-java",
|
||||||
"dnsresolver_aidl_interface-V2-java",
|
"dnsresolver_aidl_interface-V2-java",
|
||||||
"netd_event_listener_interface-java",
|
"netd_event_listener_interface-java",
|
||||||
"ike-stubs",
|
|
||||||
],
|
],
|
||||||
|
|
||||||
plugins: [
|
plugins: [
|
||||||
|
|||||||
@@ -26,6 +26,8 @@ android_app {
|
|||||||
"services.core",
|
"services.core",
|
||||||
"services.net",
|
"services.net",
|
||||||
],
|
],
|
||||||
|
|
||||||
|
libs: ["ike-stubs"],
|
||||||
}
|
}
|
||||||
|
|
||||||
//##################################################################
|
//##################################################################
|
||||||
|
|||||||
@@ -28,6 +28,8 @@ android_app {
|
|||||||
"services.core",
|
"services.core",
|
||||||
"services.net",
|
"services.net",
|
||||||
],
|
],
|
||||||
|
|
||||||
|
libs: ["ike-stubs"],
|
||||||
}
|
}
|
||||||
|
|
||||||
//##################################################################
|
//##################################################################
|
||||||
|
|||||||
Reference in New Issue
Block a user