Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Do not statically link ike-stubs" am: d63c9d71b1 am: c3f22ed19d

Browse Source 
Change-Id: Ied6a4dce96361e231ee1661dbb1eb1155ca36a75
This commit is contained in:
Automerger Merge Worker
2020-02-25 22:37:46 +00:00
parent 0d244fe4aa c3f22ed19d
commit eaa73fd3ea
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/Android.bp
View File

@@ -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: [

2
services/robotests/Android.bp
View File

@@ -26,6 +26,8 @@ android_app {
"services.core", "services.core",
"services.net", "services.net",
], ],
libs: ["ike-stubs"],
} }
//################################################################## //##################################################################

2
services/robotests/backup/Android.bp
View File

@@ -28,6 +28,8 @@ android_app {
"services.core", "services.core",
"services.net", "services.net",
], ],
libs: ["ike-stubs"],
} }
//################################################################## //##################################################################