Snap for 9224945 from 58bbe0a9400e80f5f167ba43fea76ab1bf743191 to mainline-tethering-release
Change-Id: Ic9840214970418f66558df83bca7cc1c642d8251
diff --git a/processor/Android.bp b/processor/Android.bp
index 043ef19..7dbdbc0 100644
--- a/processor/Android.bp
+++ b/processor/Android.bp
@@ -12,9 +12,8 @@
default_applicable_licenses: ["external_robolectric-shadows_license"],
}
-java_plugin {
- name: "Robolectric_processor",
- processor_class: "org.robolectric.annotation.processing.RobolectricProcessor",
+java_library_host {
+ name: "libRobolectric_processor",
srcs: ["src/main/java/**/*.java"],
java_resource_dirs: ["src/main/resources"],
java_resources: ["sdks.txt"],
@@ -38,6 +37,12 @@
},
}
+java_plugin {
+ name: "Robolectric_processor",
+ processor_class: "org.robolectric.annotation.processing.RobolectricProcessor",
+ static_libs: ["libRobolectric_processor"],
+}
+
//#############################################
// Compile Robolectric processor tests
//#############################################
@@ -49,7 +54,7 @@
static_libs: [
"Robolectric_annotations",
- "Robolectric_processor",
+ "libRobolectric_processor",
"Robolectric_shadowapi",
"robolectric-javax.annotation-api-1.2",
"robolectric-compile-testing-0.19",
