Merge "Declare jack, jill and libs for prebuilt android.jar"
diff --git a/Android.mk b/Android.mk
index b78e5a8..7aefa54 100644
--- a/Android.mk
+++ b/Android.mk
@@ -24,6 +24,10 @@
$$(_cpsttrp_sdk_intermediates)/classes.jar : $$(_cpsttrp_src_jar) | $(ACP)
$$(call copy-file-to-target)
+$$(_cpsttrp_sdk_intermediates)/classes.jack : $$(_cpsttrp_src_jar) $(JILL_JAR)
+ $(hide) mkdir -p $$(dir $$@)
+ $(hide) $(JILL) $$< --output $$@
+
$$(_cpsttrp_sdk_intermediates)/javalib.jar : $$(_cpsttrp_sdk_intermediates)/classes.jar | $(ACP)
$$(call copy-file-to-target)
@@ -34,6 +38,10 @@
$$(_cpsttrp_sdk_intermediates)/classes.jar : $$(_cpsttrp_src_jar) | $(ACP)
$$(call copy-file-to-target)
+$$(_cpsttrp_sdk_intermediates)/classes.jack : $$(_cpsttrp_src_jar) $(JILL_JAR)
+ $(hide) mkdir -p $$(dir $$@)
+ $(hide) $(JILL) $$< --output $$@
+
$$(_cpsttrp_sdk_intermediates)/javalib.jar : $$(_cpsttrp_sdk_intermediates)/classes.jar | $(ACP)
$$(call copy-file-to-target)
endef
diff --git a/tools/Android.mk b/tools/Android.mk
index 06997d0..fc73ad4 100644
--- a/tools/Android.mk
+++ b/tools/Android.mk
@@ -16,6 +16,31 @@
LOCAL_PATH:= $(call my-dir)
+##################################
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := jack
+LOCAL_SRC_FILES := jack.jar
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_SUFFIX := $(COMMON_JAVA_PACKAGE_SUFFIX)
+LOCAL_BUILT_MODULE_STEM := jack$(COMMON_JAVA_PACKAGE_SUFFIX)
+LOCAL_IS_HOST_MODULE := true
+
+include $(BUILD_PREBUILT)
+##################################
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := jill
+LOCAL_SRC_FILES := jill.jar
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_SUFFIX := $(COMMON_JAVA_PACKAGE_SUFFIX)
+LOCAL_BUILT_MODULE_STEM := jill$(COMMON_JAVA_PACKAGE_SUFFIX)
+LOCAL_IS_HOST_MODULE := true
+
+include $(BUILD_PREBUILT)
+
ifneq (,$(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK)))
##################################