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

Merge "Merge "Merge "Properly use versioned interfaces." am: 9572afce76 am: b92fbe0435" into qt-dev-plus-aosp am: 5b992330bb" into qt-r1-dev-plus-aosp

Browse Source
This commit is contained in:
Android Build Merger (Role)
2019-05-22 13:25:36 +00:00
committed by Android (Google) Code Review
parent 8819dbff77 9cc19a03da
commit b010e1210b
7 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/NetworkStack/Android.bp
View File

@@ -42,8 +42,8 @@ android_library {
static_libs: [
"androidx.annotation_annotation",
"ipmemorystore-client",
"netd_aidl_interface-java",
"networkstack-aidl-interfaces-java",
"netd_aidl_interface-V2-java",
"networkstack-aidl-interfaces-V3-java",
"datastallprotosnano",
"networkstackprotosnano",
"captiveportal-lib",

4
packages/NetworkStack/tests/unit/Android.bp
View File

@@ -72,7 +72,7 @@ android_test {
"libutilscallstack",
"libziparchive",
"libz",
"netd_aidl_interface-cpp",
"netd_aidl_interface-V2-cpp",
],
}
@@ -94,7 +94,7 @@ cc_library_shared {
"liblog",
"libcutils",
"libnativehelper",
"netd_aidl_interface-cpp",
"netd_aidl_interface-V2-cpp",
],
static_libs: [
"libapf",

4
services/core/Android.bp
View File

@@ -51,8 +51,8 @@ java_library_static {
"android.hardware.configstore-V1.0-java",
"android.hardware.contexthub-V1.0-java",
"android.hidl.manager-V1.2-java",
"dnsresolver_aidl_interface-java",
"netd_aidl_interface-java",
"dnsresolver_aidl_interface-V2-java",
"netd_aidl_interface-V2-java",
"netd_event_listener_interface-java",
],
}

8
services/net/Android.bp
View File

@@ -65,10 +65,10 @@ java_library_static {
name: "services.net",
srcs: ["java/**/*.java"],
static_libs: [
"dnsresolver_aidl_interface-java",
"dnsresolver_aidl_interface-V2-java",
"ipmemorystore-client",
"netd_aidl_interface-java",
"networkstack-aidl-interfaces-java",
"netd_aidl_interface-V2-java",
"networkstack-aidl-interfaces-V3-java",
],
}
@@ -81,7 +81,7 @@ java_library_static {
"java/android/net/ipmemorystore/**/*.java",
],
static_libs: [
"ipmemorystore-aidl-interfaces-java",
"ipmemorystore-aidl-interfaces-V3-java",
],
}

2
services/tests/servicestests/Android.bp
View File

@@ -73,7 +73,7 @@ android_test {
"libui",
"libunwindstack",
"libutils",
"netd_aidl_interface-cpp",
"netd_aidl_interface-V2-cpp",
],
dxflags: ["--multi-dex"],

2
services/tests/uiservicestests/Android.bp
View File

@@ -55,6 +55,6 @@ android_test {
"libui",
"libunwindstack",
"libutils",
"netd_aidl_interface-cpp",
"netd_aidl_interface-V2-cpp",
],
}

2
tests/net/Android.bp
View File

@@ -56,7 +56,7 @@ java_defaults {
"libutilscallstack",
"libziparchive",
"libz",
"netd_aidl_interface-cpp",
"netd_aidl_interface-V2-cpp",
"libnetworkstatsfactorytestjni",
],
}