Only include RS prebuilts in unbundled branches, not PDK.

Change-Id: I6d3dbcfee075093ffef9ec88fb11a27922342762

1 files changed, 55 insertions, 44 deletions

diff --git a/tools/Android.mk b/tools/Android.mk
index 4244acb..2dc7817 100644
--- a/tools/Android.mk
+++ b/tools/Android.mk
@@ -61,15 +61,15 @@ LOCAL_IS_HOST_MODULE := true
 include $(BUILD_PREBUILT)
 
 ##################################
+
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := bcc_compat
-LOCAL_SRC_FILES := $(HOST_OS)/$(LOCAL_MODULE)$(HOST_EXECUTABLE_SUFFIX)
+LOCAL_MODULE := zipalign
+LOCAL_SRC_FILES := $(HOST_OS)/zipalign$(HOST_EXECUTABLE_SUFFIX)
 LOCAL_MODULE_CLASS := EXECUTABLES
 LOCAL_MODULE_TAGS := optional
-LOCAL_REQUIRED_MODULES := libbcc_compat libbcinfo_compat
 LOCAL_MODULE_SUFFIX := $(HOST_EXECUTABLE_SUFFIX)
-LOCAL_BUILT_MODULE_STEM := $(LOCAL_MODULE)$(HOST_EXECUTABLE_SUFFIX)
+LOCAL_BUILT_MODULE_STEM := zipalign$(HOST_EXECUTABLE_SUFFIX)
 LOCAL_IS_HOST_MODULE := true
 
 include $(BUILD_PREBUILT)
@@ -77,11 +77,12 @@ include $(BUILD_PREBUILT)
 ##################################
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := libbcc_compat
-LOCAL_SRC_FILES := $(HOST_OS)/libbcc.so
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+LOCAL_MODULE := signapk
+LOCAL_SRC_FILES := lib/signapk.jar
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
 LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_SUFFIX := .so
+LOCAL_MODULE_SUFFIX := $(COMMON_JAVA_PACKAGE_SUFFIX)
+LOCAL_BUILT_MODULE_STEM := signapk$(COMMON_JAVA_PACKAGE_SUFFIX)
 LOCAL_IS_HOST_MODULE := true
 
 include $(BUILD_PREBUILT)
@@ -89,11 +90,12 @@ include $(BUILD_PREBUILT)
 ##################################
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := libbcinfo_compat
-LOCAL_SRC_FILES := $(HOST_OS)/libbcinfo.so
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+LOCAL_MODULE := dx
+LOCAL_SRC_FILES := lib/dx.jar
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
 LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_SUFFIX := .so
+LOCAL_MODULE_SUFFIX := $(COMMON_JAVA_PACKAGE_SUFFIX)
+LOCAL_BUILT_MODULE_STEM := dx$(COMMON_JAVA_PACKAGE_SUFFIX)
 LOCAL_IS_HOST_MODULE := true
 
 include $(BUILD_PREBUILT)
@@ -101,25 +103,41 @@ include $(BUILD_PREBUILT)
 ##################################
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := llvm-rs-cc
-LOCAL_SRC_FILES := $(HOST_OS)/llvm-rs-cc$(HOST_EXECUTABLE_SUFFIX)
+# We have to call copy-file-to-new-target instead of simply including
+# $(BUILD_PREBUILT) here, because we must put dx.jar as dependecy of dx.
+
+LOCAL_MODULE := dx
+LOCAL_IS_HOST_MODULE := true
 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)
+include $(BUILD_SYSTEM)/base_rules.mk
+
+$(LOCAL_BUILT_MODULE): $(HOST_OUT_JAVA_LIBRARIES)/dx$(COMMON_JAVA_PACKAGE_SUFFIX)
+$(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/dx | $(ACP)
+	@echo "Copy: $(PRIVATE_MODULE) ($@)"
+	$(copy-file-to-new-target)
+	$(hide) chmod 755 $@
+
+##################################
+
+endif # TARGET_BUILD_APPS or TARGET_BUILD_PDK
+
+# Only use these prebuilts in unbundled branches
+# Don't use prebuilts in PDK
+
+ifneq (,$(TARGET_BUILD_APPS))
 
 ##################################
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := zipalign
-LOCAL_SRC_FILES := $(HOST_OS)/zipalign$(HOST_EXECUTABLE_SUFFIX)
+LOCAL_MODULE := bcc_compat
+LOCAL_SRC_FILES := $(HOST_OS)/$(LOCAL_MODULE)$(HOST_EXECUTABLE_SUFFIX)
 LOCAL_MODULE_CLASS := EXECUTABLES
 LOCAL_MODULE_TAGS := optional
+LOCAL_REQUIRED_MODULES := libbcc libbcinfo
 LOCAL_MODULE_SUFFIX := $(HOST_EXECUTABLE_SUFFIX)
-LOCAL_BUILT_MODULE_STEM := zipalign$(HOST_EXECUTABLE_SUFFIX)
+LOCAL_BUILT_MODULE_STEM := $(LOCAL_MODULE)$(HOST_EXECUTABLE_SUFFIX)
 LOCAL_IS_HOST_MODULE := true
 
 include $(BUILD_PREBUILT)
@@ -127,12 +145,11 @@ include $(BUILD_PREBUILT)
 ##################################
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := signapk
-LOCAL_SRC_FILES := lib/signapk.jar
-LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+LOCAL_MODULE := libbcc
+LOCAL_SRC_FILES := $(HOST_OS)/$(LOCAL_MODULE).so
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_SUFFIX := $(COMMON_JAVA_PACKAGE_SUFFIX)
-LOCAL_BUILT_MODULE_STEM := signapk$(COMMON_JAVA_PACKAGE_SUFFIX)
+LOCAL_MODULE_SUFFIX := .so
 LOCAL_IS_HOST_MODULE := true
 
 include $(BUILD_PREBUILT)
@@ -140,12 +157,11 @@ include $(BUILD_PREBUILT)
 ##################################
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := dx
-LOCAL_SRC_FILES := lib/dx.jar
-LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+LOCAL_MODULE := libbcinfo
+LOCAL_SRC_FILES := $(HOST_OS)/$(LOCAL_MODULE).so
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_SUFFIX := $(COMMON_JAVA_PACKAGE_SUFFIX)
-LOCAL_BUILT_MODULE_STEM := dx$(COMMON_JAVA_PACKAGE_SUFFIX)
+LOCAL_MODULE_SUFFIX := .so
 LOCAL_IS_HOST_MODULE := true
 
 include $(BUILD_PREBUILT)
@@ -153,21 +169,16 @@ include $(BUILD_PREBUILT)
 ##################################
 include $(CLEAR_VARS)
 
-# We have to call copy-file-to-new-target instead of simply including
-# $(BUILD_PREBUILT) here, because we must put dx.jar as dependecy of dx.
-
-LOCAL_MODULE := dx
-LOCAL_IS_HOST_MODULE := true
+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_SYSTEM)/base_rules.mk
-
-$(LOCAL_BUILT_MODULE): $(HOST_OUT_JAVA_LIBRARIES)/dx$(COMMON_JAVA_PACKAGE_SUFFIX)
-$(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/dx | $(ACP)
-	@echo "Copy: $(PRIVATE_MODULE) ($@)"
-	$(copy-file-to-new-target)
-	$(hide) chmod 755 $@
+include $(BUILD_PREBUILT)
 
 ##################################
-endif # TARGET_BUILD_APPS or TARGET_BUILD_PDK
+
+endif # TARGET_BUILD_APPS only