diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-02-28 21:20:01 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-02-28 21:20:01 +0000 |
commit | 57575d42cb999adea09b583fbdc5cfbfaf64a08c (patch) | |
tree | 9f0d53c3707c0eed10556d34d5ec6d12fcaea90b | |
parent | 88e987a04e852cb1884366e8a4ac19e50361a1b3 (diff) | |
parent | cbab44b69065e0d761c20aeb5a6d7d7d175624b5 (diff) | |
download | platform-compat-simpleperf-release.tar.gz |
Snap for 11510257 from cbab44b69065e0d761c20aeb5a6d7d7d175624b5 to simpleperf-releasesimpleperf-release
Change-Id: I6b0dbffb9f5c89338eab9ce8260e308f099b9f59
-rw-r--r-- | build/Android.bp | 1 | ||||
-rw-r--r-- | java/android/compat/annotation/Android.bp | 15 | ||||
-rw-r--r-- | javatest/android/processor/compat/changeid/Android.bp | 1 | ||||
-rw-r--r-- | javatest/android/processor/compat/unsupportedappusage/Android.bp | 1 | ||||
-rw-r--r-- | javatest/com/android/annotationvisitor/Android.bp | 1 | ||||
-rw-r--r-- | javatest/com/android/class2nonsdklist/Android.bp | 1 |
6 files changed, 20 insertions, 0 deletions
diff --git a/build/Android.bp b/build/Android.bp index 59b2a9f..16c3be2 100644 --- a/build/Android.bp +++ b/build/Android.bp @@ -15,6 +15,7 @@ */ package { + default_team: "trendy_team_android_developer_tools", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/java/android/compat/annotation/Android.bp b/java/android/compat/annotation/Android.bp index d6fab6b..6172c83 100644 --- a/java/android/compat/annotation/Android.bp +++ b/java/android/compat/annotation/Android.bp @@ -60,3 +60,18 @@ java_library { sdk_version: "core_current", exported_plugins: ["unsupportedappusage-annotation-processor"], } + +// Identical to unsupportedappusage, but sdk_version is none. +// Used for core modules where setting sdk_version of the dependencies as +// core_current leads to circular dependencies +java_library { + name: "unsupportedappusage-sdk-none", + host_supported: true, + srcs: [ + "UnsupportedAppUsage.java", + ], + sdk_version: "none", + system_modules: "core-all-system-modules", + exported_plugins: ["unsupportedappusage-annotation-processor"], + patch_module: "java.base", +} diff --git a/javatest/android/processor/compat/changeid/Android.bp b/javatest/android/processor/compat/changeid/Android.bp index 8743150..9186ad8 100644 --- a/javatest/android/processor/compat/changeid/Android.bp +++ b/javatest/android/processor/compat/changeid/Android.bp @@ -15,6 +15,7 @@ */ package { + default_team: "trendy_team_android_developer_tools", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/javatest/android/processor/compat/unsupportedappusage/Android.bp b/javatest/android/processor/compat/unsupportedappusage/Android.bp index 9ed0876..e8774da 100644 --- a/javatest/android/processor/compat/unsupportedappusage/Android.bp +++ b/javatest/android/processor/compat/unsupportedappusage/Android.bp @@ -15,6 +15,7 @@ */ package { + default_team: "trendy_team_android_developer_tools", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/javatest/com/android/annotationvisitor/Android.bp b/javatest/com/android/annotationvisitor/Android.bp index 9130be5..85277cf 100644 --- a/javatest/com/android/annotationvisitor/Android.bp +++ b/javatest/com/android/annotationvisitor/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_android_developer_tools", default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/javatest/com/android/class2nonsdklist/Android.bp b/javatest/com/android/class2nonsdklist/Android.bp index 6580949..f6aae51 100644 --- a/javatest/com/android/class2nonsdklist/Android.bp +++ b/javatest/com/android/class2nonsdklist/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_android_developer_tools", default_applicable_licenses: ["Android-Apache-2.0"], } |