1 files changed, 42 insertions, 2 deletions
diff --git a/Android.bp b/Android.bp
index 8e22d91..c7c981f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -57,8 +57,11 @@ java_import_host {
 
 // build vogar jar
 java_library_host {
-    name: "vogar",
+    name: "vogar-host-jar",
     srcs: ["src/**/*.java"],
+    // Make the host jar file name to be vogar.jar due to in vogar-script it
+    // expect the jar to be vogar.jar.
+    stem: "vogar",
     java_resource_dirs: ["resources"],
     static_libs: [
         "caliper",
@@ -75,6 +78,26 @@ java_library_host {
     ],
 }
 
+// copy vogar script
+sh_binary_host {
+    // Set filename to the same name as the stem of vogar-host-jar to align with
+    // original make behavior.
+    name: "vogar-script",
+    src: "bin/vogar-android",
+    filename: "vogar",
+}
+
+// User can build both vogar-host-jar and vogar-script just use vogar as target
+// name. This could be replace after soong has implemented the wrapper function
+// for java_library_host.
+phony_rule {
+    name: "vogar",
+    phony_deps: [
+        "vogar-host-jar",
+        "vogar-script",
+    ],
+}
+
 // build vogar tests jar
 java_library_host {
     name: "vogar-tests",
@@ -83,6 +106,23 @@ java_library_host {
         "junit",
         "mockito",
         "objenesis",
-        "vogar",
+        "vogar-host-jar",
+    ],
+}
+
+// Run the tests using using run-vogar-tests.
+java_genrule_host {
+    name: "vogar-tests-result",
+    srcs: [
+        ":vogar-tests",
+    ],
+    cmd: "ANDROID_BUILD_TOP=$$(pwd) java -cp $(in) org.junit.runner.JUnitCore vogar.AllTests 2>&1 | tee $(out)",
+    out: ["vogar-tests-result.txt"],
+}
+
+phony_rule {
+    name: "run-vogar-tests",
+    phony_deps: [
+        "vogar-tests-result",
     ],
 }