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)" {} \; \
    | grep -v oemnetd | grep -v tests/

Test: m
Bug: 133124190
(cherry-pick from aosp/968011)
Merged-In: Idf49e840263ef32b9ee4fafa6718d4f893ea7c87
(cherry picked from commit 433f7c4178)

Change-Id: I77e2291b52fda24ee01e1b22ddafe4fe7368959e
This commit is contained in:
Lorenzo Colitti
2019-05-22 01:20:45 -07:00
committed by Remi NGUYEN VAN
parent c717c59031
commit cb29c2b2c9
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

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

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

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

View File

@@ -55,6 +55,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",
],
}