diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2016-02-16 21:23:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-02-16 21:23:36 +0000 |
| commit | 69a4592aa50e9b6d675af83b6b2392796803395a (patch) | |
| tree | 3548c28cf6948285873c390594dc5bfa592893df | |
| parent | 03f0a038578ca86e93408bdc7c00e5ac8f1a3578 (diff) | |
| parent | c6e194ffadc2b2c83daed3011d6afa1764244499 (diff) | |
| download | build-69a4592aa50e9b6d675af83b6b2392796803395a.tar.gz | |
Merge "Define a class for renderscript bitcode files"
| -rw-r--r-- | core/definitions.mk | 2 | ||||
| -rw-r--r-- | core/envsetup.mk | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/core/definitions.mk b/core/definitions.mk index 4a6ec02f7d..c40e6bcf82 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -501,7 +501,7 @@ $(strip \ $(eval _idf2ndArchPrefix := $(if $(strip $(5)),$(TARGET_2ND_ARCH_VAR_PREFIX))) \ $(if $(filter $(_idfPrefix)-$(_idfClass),$(COMMON_MODULE_CLASSES))$(4), \ $(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 := $($(_idfPrefix)_OUT_INTERMEDIATES)) \ ) \ diff --git a/core/envsetup.mk b/core/envsetup.mk index ae63ae712c..4456809f7b 100644 --- a/core/envsetup.mk +++ b/core/envsetup.mk @@ -237,6 +237,7 @@ BUILD_OUT_EXECUTABLES := $(BUILD_OUT)/bin HOST_OUT_EXECUTABLES := $(HOST_OUT)/bin HOST_OUT_SHARED_LIBRARIES := $(HOST_OUT)/lib64 +HOST_OUT_RENDERSCRIPT_BITCODE := $(HOST_OUT_SHARED_LIBRARIES) HOST_OUT_JAVA_LIBRARIES := $(HOST_OUT)/framework HOST_OUT_SDK_ADDON := $(HOST_OUT)/sdk_addon @@ -309,6 +310,7 @@ TARGET_OUT_SHARED_LIBRARIES := $(target_out_shared_libraries_base)/lib64 else TARGET_OUT_SHARED_LIBRARIES := $(target_out_shared_libraries_base)/lib endif +TARGET_OUT_RENDERSCRIPT_BITCODE := $(TARGET_OUT_SHARED_LIBRARIES) TARGET_OUT_JAVA_LIBRARIES := $(TARGET_OUT)/framework TARGET_OUT_APPS := $(TARGET_OUT)/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_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_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_APPS := $(TARGET_OUT_APPS) $(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 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))) DIST_DIR := $(OUT_DIR)/dist |