Merge "Replace custom rules with BUILD_PREBUILT"
am: 3425268
* commit '3425268fd566a2cf5613bff4e515ea99f07314b5':
Replace custom rules with BUILD_PREBUILT
diff --git a/baksmali/Android.mk b/baksmali/Android.mk
index 9ef2967..a5ee9ab 100644
--- a/baksmali/Android.mk
+++ b/baksmali/Android.mk
@@ -61,13 +61,7 @@
include $(CLEAR_VARS)
LOCAL_IS_HOST_MODULE := true
LOCAL_MODULE_CLASS := EXECUTABLES
-LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := baksmali
-
-include $(BUILD_SYSTEM)/base_rules.mk
-
-$(LOCAL_BUILT_MODULE): $(HOST_OUT_JAVA_LIBRARIES)/baksmalilib.jar
-$(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/../scripts/baksmali | $(ACP)
- @echo "Copy: $(PRIVATE_MODULE) ($@)"
- $(copy-file-to-new-target)
- $(hide) chmod 755 $@
\ No newline at end of file
+LOCAL_SRC_FILES := ../scripts/baksmali
+LOCAL_REQUIRED_MODULES := baksmalilib
+include $(BUILD_PREBUILT)
diff --git a/smali/Android.mk b/smali/Android.mk
index 7f6aac7..40bd640 100644
--- a/smali/Android.mk
+++ b/smali/Android.mk
@@ -67,13 +67,7 @@
include $(CLEAR_VARS)
LOCAL_IS_HOST_MODULE := true
LOCAL_MODULE_CLASS := EXECUTABLES
-LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := smali
-
-include $(BUILD_SYSTEM)/base_rules.mk
-
-$(LOCAL_BUILT_MODULE): $(HOST_OUT_JAVA_LIBRARIES)/smalilib.jar
-$(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/../scripts/smali | $(ACP)
- @echo "Copy: $(PRIVATE_MODULE) ($@)"
- $(copy-file-to-new-target)
- $(hide) chmod 755 $@
\ No newline at end of file
+LOCAL_SRC_FILES := ../scripts/smali
+LOCAL_REQUIRED_MODULES := smalilib
+include $(BUILD_PREBUILT)