Properly use versioned interfaces.

Our stable AIDL interfaces need to use versioned build targets,
otherwise getVersion will always return 0, which makes it
impossible to support different components at different versions.

List generated with:
find . -name Android.bp -exec egrep \
    -H "(netd|dnsresolver|ipmemorystore|networkstack).aidl.interface(s?)-(java|cpp)" {} \;

Bug: 133124190
Test: m
Change-Id: Id175c99daa77507847673777a8dcce51897ab17b
This commit is contained in:
Lorenzo Colitti
2019-05-21 19:45:09 +09:00
committed by Remi NGUYEN VAN
parent ee18cdc67b
commit fe0c38aed5
7 changed files with 13 additions and 13 deletions

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",

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",

View File

@@ -49,8 +49,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",
],
}

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",
],
}

View File

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

View File

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

View File

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