Merge "enable renderscript build in PDK by using prebuilt llvm-rs-cc"
diff --git a/tools/Android.mk b/tools/Android.mk
index 2dc7817..eda1a42 100644
--- a/tools/Android.mk
+++ b/tools/Android.mk
@@ -120,6 +120,19 @@
$(hide) chmod 755 $@
##################################
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := llvm-rs-cc
+LOCAL_SRC_FILES := $(HOST_OS)/llvm-rs-cc$(HOST_EXECUTABLE_SUFFIX)
+LOCAL_MODULE_CLASS := EXECUTABLES
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_SUFFIX := $(HOST_EXECUTABLE_SUFFIX)
+LOCAL_BUILT_MODULE_STEM := llvm-rs-cc$(HOST_EXECUTABLE_SUFFIX)
+LOCAL_IS_HOST_MODULE := true
+
+include $(BUILD_PREBUILT)
+
+##################################
endif # TARGET_BUILD_APPS or TARGET_BUILD_PDK
@@ -167,18 +180,5 @@
include $(BUILD_PREBUILT)
##################################
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := llvm-rs-cc
-LOCAL_SRC_FILES := $(HOST_OS)/llvm-rs-cc$(HOST_EXECUTABLE_SUFFIX)
-LOCAL_MODULE_CLASS := EXECUTABLES
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_SUFFIX := $(HOST_EXECUTABLE_SUFFIX)
-LOCAL_BUILT_MODULE_STEM := llvm-rs-cc$(HOST_EXECUTABLE_SUFFIX)
-LOCAL_IS_HOST_MODULE := true
-
-include $(BUILD_PREBUILT)
-
-##################################
endif # TARGET_BUILD_APPS only