diff options
| author | 2020-02-21 10:55:02 -0800 | |
|---|---|---|
| committer | 2020-02-25 00:40:05 -0800 | |
| commit | d713db92a591dbeca80f468c88b9e1f0ebfd9339 (patch) | |
| tree | 38e2804b5665cca283ad109ed50b06a6b8f94e4a | |
| parent | faff9bd887e952b07de6475b5c75b135a4aad000 (diff) | |
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 5fc0bbaae70508ebb9355387403d91e23fa64e73)
| -rw-r--r-- | services/core/Android.bp | 2 | ||||
| -rw-r--r-- | services/robotests/Android.bp | 2 | ||||
| -rw-r--r-- | services/robotests/backup/Android.bp | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/services/core/Android.bp b/services/core/Android.bp index 4da60b8e4ffd..3180ceb8f8e1 100644 --- a/services/core/Android.bp +++ b/services/core/Android.bp @@ -99,6 +99,7 @@ java_library_static { "android.hardware.vibrator-java", "app-compat-annotations", "framework-tethering-stubs", + "ike-stubs", ], required: [ @@ -126,7 +127,6 @@ java_library_static { "android.hidl.manager-V1.2-java", "dnsresolver_aidl_interface-V2-java", "netd_event_listener_interface-java", - "ike-stubs", ], plugins: [ diff --git a/services/robotests/Android.bp b/services/robotests/Android.bp index d2f86eeabb47..602e4e1ac8ce 100644 --- a/services/robotests/Android.bp +++ b/services/robotests/Android.bp @@ -26,6 +26,8 @@ android_app { "services.core", "services.net", ], + + libs: ["ike-stubs"], } //################################################################## diff --git a/services/robotests/backup/Android.bp b/services/robotests/backup/Android.bp index ef0ca66610c9..5160eae060f6 100644 --- a/services/robotests/backup/Android.bp +++ b/services/robotests/backup/Android.bp @@ -28,6 +28,8 @@ android_app { "services.core", "services.net", ], + + libs: ["ike-stubs"], } //################################################################## |