Merge "Move jasmin build rules from make to soong"
diff --git a/dx/Android.bp b/dx/Android.bp
index bb2a68f..3783c1f 100644
--- a/dx/Android.bp
+++ b/dx/Android.bp
@@ -36,3 +36,14 @@
},
},
}
+
+java_binary_host {
+ name: "jasmin",
+ wrapper: "etc/jasmin",
+ static_libs: [ "jasmin-jar" ],
+}
+
+java_import_host {
+ name: "jasmin-jar",
+ jars: ["etc/jasmin.jar"],
+}
diff --git a/dx/Android.mk b/dx/Android.mk
index 78d2d40..09ccce1 100644
--- a/dx/Android.mk
+++ b/dx/Android.mk
@@ -103,44 +103,3 @@
INTERNAL_DALVIK_MODULES += $(LOCAL_INSTALLED_MODULE)
endif # No TARGET_BUILD_APPS or TARGET_BUILD_PDK
-
-# the jasmin script
-# ============================================================
-include $(CLEAR_VARS)
-LOCAL_IS_HOST_MODULE := true
-LOCAL_MODULE_CLASS := EXECUTABLES
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := jasmin
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS := notice
-LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE
-
-include $(BUILD_SYSTEM)/base_rules.mk
-
-$(LOCAL_BUILT_MODULE): $(HOST_OUT_JAVA_LIBRARIES)/jasmin.jar
-$(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/etc/jasmin | $(ACP)
- @echo "Copy: $(PRIVATE_MODULE) ($@)"
- $(copy-file-to-new-target)
- $(hide) chmod 755 $@
-
-INTERNAL_DALVIK_MODULES += $(LOCAL_INSTALLED_MODULE)
-
-# the jasmin lib
-# ============================================================
-include $(CLEAR_VARS)
-LOCAL_IS_HOST_MODULE := true
-LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := jasmin.jar
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS := notice
-LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE
-
-include $(BUILD_SYSTEM)/base_rules.mk
-
-$(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/etc/jasmin.jar | $(ACP)
- @echo "Copy: $(PRIVATE_MODULE) ($@)"
- $(copy-file-to-target)
- $(hide) chmod 644 $@
-
-INTERNAL_DALVIK_MODULES += $(LOCAL_INSTALLED_MODULE)
