Merge "Define a class for renderscript bitcode files" (69a4592a) · Commits · e / os / android_build

core/definitions.mk

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -501,7 +501,7 @@ $(strip \
	$(eval _idf2ndArchPrefix := $(if $(strip $(5)),$(TARGET_2ND_ARCH_VAR_PREFIX))) \		$(eval _idf2ndArchPrefix := $(if $(strip $(5)),$(TARGET_2ND_ARCH_VAR_PREFIX))) \
	$(if $(filter $(_idfPrefix)-$(_idfClass),$(COMMON_MODULE_CLASSES))$(4), \		$(if $(filter $(_idfPrefix)-$(_idfClass),$(COMMON_MODULE_CLASSES))$(4), \
	$(eval _idfIntBase := $($(_idfPrefix)_OUT_COMMON_INTERMEDIATES)) \		$(eval _idfIntBase := $($(_idfPrefix)_OUT_COMMON_INTERMEDIATES)) \
	,$(if $(filter $(_idfClass),SHARED_LIBRARIES STATIC_LIBRARIES EXECUTABLES GYP),\		,$(if $(filter $(_idfClass),$(PER_ARCH_MODULE_CLASSES)),\
	$(eval _idfIntBase := $($(_idf2ndArchPrefix)$(_idfPrefix)_OUT_INTERMEDIATES)) \		$(eval _idfIntBase := $($(_idf2ndArchPrefix)$(_idfPrefix)_OUT_INTERMEDIATES)) \
	,$(eval _idfIntBase := $($(_idfPrefix)_OUT_INTERMEDIATES)) \		,$(eval _idfIntBase := $($(_idfPrefix)_OUT_INTERMEDIATES)) \
	) \		) \

core/envsetup.mk

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -237,6 +237,7 @@ BUILD_OUT_EXECUTABLES := $(BUILD_OUT)/bin

	HOST_OUT_EXECUTABLES := $(HOST_OUT)/bin		HOST_OUT_EXECUTABLES := $(HOST_OUT)/bin
	HOST_OUT_SHARED_LIBRARIES := $(HOST_OUT)/lib64		HOST_OUT_SHARED_LIBRARIES := $(HOST_OUT)/lib64
			HOST_OUT_RENDERSCRIPT_BITCODE := $(HOST_OUT_SHARED_LIBRARIES)
	HOST_OUT_JAVA_LIBRARIES := $(HOST_OUT)/framework		HOST_OUT_JAVA_LIBRARIES := $(HOST_OUT)/framework
	HOST_OUT_SDK_ADDON := $(HOST_OUT)/sdk_addon		HOST_OUT_SDK_ADDON := $(HOST_OUT)/sdk_addon

	@@ -309,6 +310,7 @@ TARGET_OUT_SHARED_LIBRARIES := $(target_out_shared_libraries_base)/lib64
	else		else
	TARGET_OUT_SHARED_LIBRARIES := $(target_out_shared_libraries_base)/lib		TARGET_OUT_SHARED_LIBRARIES := $(target_out_shared_libraries_base)/lib
	endif		endif
			TARGET_OUT_RENDERSCRIPT_BITCODE := $(TARGET_OUT_SHARED_LIBRARIES)
	TARGET_OUT_JAVA_LIBRARIES := $(TARGET_OUT)/framework		TARGET_OUT_JAVA_LIBRARIES := $(TARGET_OUT)/framework
	TARGET_OUT_APPS := $(TARGET_OUT)/app		TARGET_OUT_APPS := $(TARGET_OUT)/app
	TARGET_OUT_APPS_PRIVILEGED := $(TARGET_OUT)/priv-app		TARGET_OUT_APPS_PRIVILEGED := $(TARGET_OUT)/priv-app
	@@ -324,6 +326,7 @@ TARGET_2ND_ARCH_MODULE_SUFFIX := $(HOST_2ND_ARCH_MODULE_SUFFIX)
	$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_INTERMEDIATES := $(PRODUCT_OUT)/obj_$(TARGET_2ND_ARCH)		$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_INTERMEDIATES := $(PRODUCT_OUT)/obj_$(TARGET_2ND_ARCH)
	$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_INTERMEDIATE_LIBRARIES := $($(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_INTERMEDIATES)/lib		$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_INTERMEDIATE_LIBRARIES := $($(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_INTERMEDIATES)/lib
	$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_SHARED_LIBRARIES := $(target_out_shared_libraries_base)/lib		$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_SHARED_LIBRARIES := $(target_out_shared_libraries_base)/lib
			$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_RENDERSCRIPT_BITCODE := $($(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_SHARED_LIBRARIES)
	$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_EXECUTABLES := $(TARGET_OUT_EXECUTABLES)		$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_EXECUTABLES := $(TARGET_OUT_EXECUTABLES)
	$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_APPS := $(TARGET_OUT_APPS)		$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_APPS := $(TARGET_OUT_APPS)
	$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_APPS_PRIVILEGED := $(TARGET_OUT_APPS_PRIVILEGED)		$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_APPS_PRIVILEGED := $(TARGET_OUT_APPS_PRIVILEGED)
	@@ -431,6 +434,7 @@ TARGET_INSTALLER_ROOT_OUT := $(TARGET_INSTALLER_OUT)/root
	TARGET_INSTALLER_SYSTEM_OUT := $(TARGET_INSTALLER_OUT)/root/system		TARGET_INSTALLER_SYSTEM_OUT := $(TARGET_INSTALLER_OUT)/root/system

	COMMON_MODULE_CLASSES := TARGET-NOTICE_FILES HOST-NOTICE_FILES HOST-JAVA_LIBRARIES		COMMON_MODULE_CLASSES := TARGET-NOTICE_FILES HOST-NOTICE_FILES HOST-JAVA_LIBRARIES
			PER_ARCH_MODULE_CLASSES := SHARED_LIBRARIES STATIC_LIBRARIES EXECUTABLES GYP RENDERSCRIPT_BITCODE

	ifeq (,$(strip $(DIST_DIR)))		ifeq (,$(strip $(DIST_DIR)))
	DIST_DIR := $(OUT_DIR)/dist		DIST_DIR := $(OUT_DIR)/dist