diff options
| author | 2020-02-17 11:00:55 +0000 | |
|---|---|---|
| committer | 2020-02-17 11:00:55 +0000 | |
| commit | 0a3c802e02a0476ee37f6be68bd94a3c856463a2 (patch) | |
| tree | 3f1481d0fc766c2bf162f624e06dc7b65ccc7baf /packages/Tethering/common | |
| parent | d73f4e387c3af42abc4f5e89afe23de1c16d42f7 (diff) | |
| parent | eb22daaf5bf79d33fe09b995466a12a09c17c3c6 (diff) | |
Merge "Fix usage of annotations in TetheringLib"
Diffstat (limited to 'packages/Tethering/common')
| -rw-r--r-- | packages/Tethering/common/TetheringLib/Android.bp | 5 | ||||
| -rw-r--r-- | packages/Tethering/common/TetheringLib/jarjar-rules.txt | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/packages/Tethering/common/TetheringLib/Android.bp b/packages/Tethering/common/TetheringLib/Android.bp index 8c4f733fb62a..cb0de7a860ac 100644 --- a/packages/Tethering/common/TetheringLib/Android.bp +++ b/packages/Tethering/common/TetheringLib/Android.bp @@ -41,12 +41,12 @@ aidl_interface { java_library { name: "framework-tethering", - sdk_version: "system_current", + // TODO (b/146757305): change to module_app_current once available + sdk_version: "core_platform", srcs: [ "src/android/net/TetheredClient.java", "src/android/net/TetheringManager.java", "src/android/net/TetheringConstants.java", - ":framework-tethering-annotations", ], static_libs: [ "tethering-aidl-interfaces-java", @@ -55,6 +55,7 @@ java_library { installable: true, libs: [ + "framework-annotations-lib", "android_system_stubs_current", ], diff --git a/packages/Tethering/common/TetheringLib/jarjar-rules.txt b/packages/Tethering/common/TetheringLib/jarjar-rules.txt index 1403bba3445a..e459fad54993 100644 --- a/packages/Tethering/common/TetheringLib/jarjar-rules.txt +++ b/packages/Tethering/common/TetheringLib/jarjar-rules.txt @@ -1,2 +1 @@ -rule android.annotation.** com.android.networkstack.tethering.annotation.@1 -rule com.android.internal.annotations.** com.android.networkstack.tethering.annotation.@1
\ No newline at end of file +# jarjar rules for the bootclasspath tethering framework library here
\ No newline at end of file |