diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2019-05-22 01:20:45 -0700 |
|---|---|---|
| committer | Remi NGUYEN VAN <reminv@google.com> | 2019-05-23 07:43:47 +0000 |
| commit | cb29c2b2c90d820d4f6e7646b99f1582d484d237 (patch) | |
| tree | 8b90d798e9d51e475df044dba24fac839458ca07 /packages/NetworkStack | |
| parent | c717c590318f9a3f50f216a07ee69c2f9d5f404e (diff) | |
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 433f7c4178aaadac7d6a5f6727f39ef83342d436)
Change-Id: I77e2291b52fda24ee01e1b22ddafe4fe7368959e
Diffstat (limited to 'packages/NetworkStack')
| -rw-r--r-- | packages/NetworkStack/Android.bp | 4 | ||||
| -rw-r--r-- | packages/NetworkStack/tests/unit/Android.bp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/packages/NetworkStack/Android.bp b/packages/NetworkStack/Android.bp index aefa882f0ce8..c013b8c09ed6 100644 --- a/packages/NetworkStack/Android.bp +++ b/packages/NetworkStack/Android.bp @@ -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", diff --git a/packages/NetworkStack/tests/unit/Android.bp b/packages/NetworkStack/tests/unit/Android.bp index 039f6bf791fb..6cc80543fc74 100644 --- a/packages/NetworkStack/tests/unit/Android.bp +++ b/packages/NetworkStack/tests/unit/Android.bp @@ -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", |