Merge "Allow the unsupportedappusage-annotation to be used for device variants" am: a1df2cb009
am: e6970c06d7
Change-Id: Ibf6f3c3895602d332b2a021bccbdab1846ec73b4
diff --git a/Android.bp b/Android.bp
index a4635f9..abe2947 100644
--- a/Android.bp
+++ b/Android.bp
@@ -838,15 +838,22 @@
plugins: ["unsupportedappusage-annotation-processor"],
}
-// A host library including just UnsupportedAppUsage.java so that the annotation
-// processor can also use this annotation.
-java_library_host {
+// A library including just UnsupportedAppUsage.java classes.
+//
+// Provided for target so that libraries can use it without depending on
+// the whole of framework or the core platform API.
+//
+// Built for host so that the annotation processor can also use this annotation.
+java_library {
name: "unsupportedappusage-annotation",
+ host_supported: true,
srcs: [
"core/java/android/annotation/IntDef.java",
"core/java/android/annotation/UnsupportedAppUsage.java",
":unsupportedappusage_annotation_files",
],
+
+ sdk_version: "core_current",
}
// A temporary build target that is conditionally included on the bootclasspath if