diff options
| author | Artur Satayev <satayev@google.com> | 2019-12-11 16:33:22 +0000 |
|---|---|---|
| committer | Artur Satayev <satayev@google.com> | 2019-12-11 18:18:18 +0000 |
| commit | 6aa25ec97d97efa28c9a192a714ba4a02179ec7b (patch) | |
| tree | 4ecdec139eeb51cde441ac70a6262e8c22e27521 | |
| parent | f3c1392bdecdc27af351a880735555c197b3da60 (diff) | |
Add new UnsupportedAppUsage annotation as lib dependency.
Bug: 145132366
Test: m
Change-Id: Ibb7f8424186149365354a96249c06c9fccde66bd
| -rw-r--r-- | Android.bp | 9 | ||||
| -rw-r--r-- | cmds/uiautomator/library/Android.bp | 1 | ||||
| -rw-r--r-- | packages/Tethering/Android.bp | 1 | ||||
| -rw-r--r-- | test-mock/Android.bp | 1 |
4 files changed, 9 insertions, 3 deletions
diff --git a/Android.bp b/Android.bp index c6966f2cd9af..cf0241b7c6ba 100644 --- a/Android.bp +++ b/Android.bp @@ -379,7 +379,9 @@ java_defaults { sdk_version: "core_platform", libs: [ + "app-compat-annotations", "ext", + "unsupportedappusage", "updatable_media_stubs", ], @@ -427,7 +429,6 @@ java_library { name: "framework-minus-apex", defaults: ["framework-defaults"], srcs: [":framework-non-updatable-sources"], - libs: ["app-compat-annotations"], installable: true, javac_shard_size: 150, required: [ @@ -474,7 +475,6 @@ java_library { defaults: ["framework-defaults"], srcs: [":framework-all-sources"], installable: false, - libs: ["app-compat-annotations"], static_libs: ["exoplayer2-core"], apex_available: ["//apex_available:platform"], } @@ -483,7 +483,10 @@ java_library { name: "framework-annotation-proc", defaults: ["framework-aidl-export-defaults"], srcs: [":framework-all-sources"], - libs: ["app-compat-annotations"], + libs: [ + "app-compat-annotations", + "unsupportedappusage", + ], installable: false, plugins: [ "unsupportedappusage-annotation-processor", diff --git a/cmds/uiautomator/library/Android.bp b/cmds/uiautomator/library/Android.bp index 1173d57e5e3f..3a260639de0f 100644 --- a/cmds/uiautomator/library/Android.bp +++ b/cmds/uiautomator/library/Android.bp @@ -22,6 +22,7 @@ droiddoc { "android.test.runner", "junit", "android.test.base", + "unsupportedappusage", ], custom_template: "droiddoc-templates-sdk", installable: false, diff --git a/packages/Tethering/Android.bp b/packages/Tethering/Android.bp index 7e8721d3cc70..3c953b348ed9 100644 --- a/packages/Tethering/Android.bp +++ b/packages/Tethering/Android.bp @@ -31,6 +31,7 @@ java_defaults { "android.hardware.tetheroffload.control-V1.0-java", "tethering-client", ], + libs: ["unsupportedappusage"], manifest: "AndroidManifestBase.xml", } diff --git a/test-mock/Android.bp b/test-mock/Android.bp index aa4174ad40f4..616b6b005f89 100644 --- a/test-mock/Android.bp +++ b/test-mock/Android.bp @@ -30,6 +30,7 @@ java_sdk_library { libs: [ "framework-all", "app-compat-annotations", + "unsupportedappusage", ], api_packages: [ |