diff options
author | Ying Wang <wangying@google.com> | 2014-01-17 16:17:28 -0800 |
---|---|---|
committer | Ying Wang <wangying@google.com> | 2014-01-24 13:36:30 -0800 |
commit | dd814bf8c20c4bbc641cc7cb71685c53e92977e1 (patch) | |
tree | 7a5e727509fb7f630ef17e895e6232c9c79b61c5 /core/executable.mk | |
parent | ec6d6262acfc431abc3315b9ced28aa981416fdf (diff) | |
download | build-dd814bf8c20c4bbc641cc7cb71685c53e92977e1.zip build-dd814bf8c20c4bbc641cc7cb71685c53e92977e1.tar.gz build-dd814bf8c20c4bbc641cc7cb71685c53e92977e1.tar.bz2 |
Support to build executables for TARGET_2ND_ARCH
By default, an executable is built for TARGET_ARCH.
To build it for TARGET_2ND_ARCH in a 64bit product, use:
LOCAL_32BIT_ONLY := true
To skip a module for TARGET_2ND_ARCH, use:
LOCAL_NO_2ND_ARCH := true
Bug: 11654773
Change-Id: Ieb293d25b21024bfe1b554044df338e064ac7b46
Diffstat (limited to 'core/executable.mk')
-rw-r--r-- | core/executable.mk | 74 |
1 files changed, 9 insertions, 65 deletions
diff --git a/core/executable.mk b/core/executable.mk index f35ebcc..baa6a74 100644 --- a/core/executable.mk +++ b/core/executable.mk @@ -1,69 +1,13 @@ -########################################################### -## Standard rules for building an executable file. -## -## Additional inputs from base_rules.make: -## None. -########################################################### +# We don't automatically set up rules to build executables for both +# TARGET_ARCH and TARGET_2ND_ARCH. +# By default, an executable is built for TARGET_ARCH. +# To build it for TARGET_2ND_ARCH in a 64bit product, use "LOCAL_32BIT_ONLY := true". -ifeq ($(strip $(LOCAL_MODULE_CLASS)),) -LOCAL_MODULE_CLASS := EXECUTABLES -endif -ifeq ($(strip $(LOCAL_MODULE_SUFFIX)),) -LOCAL_MODULE_SUFFIX := $(TARGET_EXECUTABLE_SUFFIX) -endif - -$(call target-executable-hook) - -skip_build_from_source := -ifdef LOCAL_PREBUILT_MODULE_FILE -ifeq (,$(call if-build-from-source,$(LOCAL_MODULE),$(LOCAL_PATH))) -include $(BUILD_PREBUILT) -skip_build_from_source := true -endif -endif - -ifndef skip_build_from_source - -include $(BUILD_SYSTEM)/dynamic_binary.mk - -# Define PRIVATE_ variables from global vars -my_target_global_ld_dirs := $(TARGET_GLOBAL_LD_DIRS) -ifeq ($(LOCAL_CLANG),true) -my_target_global_ldflags := $(CLANG_TARGET_GLOBAL_LDFLAGS) -else -my_target_global_ldflags := $(TARGET_GLOBAL_LDFLAGS) -endif -my_target_fdo_lib := $(TARGET_FDO_LIB) -my_target_libgcc := $(TARGET_LIBGCC) -my_target_crtbegin_dynamic_o := $(TARGET_CRTBEGIN_DYNAMIC_O) -my_target_crtbegin_static_o := $(TARGET_CRTBEGIN_STATIC_O) -my_target_crtend_o := $(TARGET_CRTEND_O) -ifdef LOCAL_SDK_VERSION -# Make sure the prebuilt NDK paths are put ahead of the TARGET_GLOBAL_LD_DIRS, -# so we don't have race condition when the system libraries (such as libc, libstdc++) are also built in the tree. -my_target_global_ld_dirs := \ - $(addprefix -L, $(patsubst %/,%,$(dir $(my_ndk_stl_shared_lib_fullpath))) \ - $(my_ndk_version_root)/usr/lib) \ - $(my_target_global_ld_dirs) -my_target_global_ldflags := $(my_ndk_stl_shared_lib) $(my_target_global_ldflags) -my_target_crtbegin_dynamic_o := $(wildcard $(my_ndk_version_root)/usr/lib/crtbegin_dynamic.o) -my_target_crtbegin_static_o := $(wildcard $(my_ndk_version_root)/usr/lib/crtbegin_static.o) -my_target_crtend_o := $(wildcard $(my_ndk_version_root)/usr/lib/crtend_android.o) -endif -$(linked_module): PRIVATE_TARGET_GLOBAL_LD_DIRS := $(my_target_global_ld_dirs) -$(linked_module): PRIVATE_TARGET_GLOBAL_LDFLAGS := $(my_target_global_ldflags) -$(linked_module): PRIVATE_TARGET_FDO_LIB := $(my_target_fdo_lib) -$(linked_module): PRIVATE_TARGET_LIBGCC := $(my_target_libgcc) -$(linked_module): PRIVATE_TARGET_CRTBEGIN_DYNAMIC_O := $(my_target_crtbegin_dynamic_o) -$(linked_module): PRIVATE_TARGET_CRTBEGIN_STATIC_O := $(my_target_crtbegin_static_o) -$(linked_module): PRIVATE_TARGET_CRTEND_O := $(my_target_crtend_o) - -ifeq ($(LOCAL_FORCE_STATIC_EXECUTABLE),true) -$(linked_module): $(my_target_crtbegin_static_o) $(all_objects) $(all_libraries) $(my_target_crtend_o) - $(transform-o-to-static-executable) +ifeq ($(TARGET_IS_64_BIT)|$(LOCAL_32BIT_ONLY),true|true) +LOCAL_2ND_ARCH_VAR_PREFIX := $(TARGET_2ND_ARCH_VAR_PREFIX) else -$(linked_module): $(my_target_crtbegin_dynamic_o) $(all_objects) $(all_libraries) $(my_target_crtend_o) - $(transform-o-to-executable) +LOCAL_2ND_ARCH_VAR_PREFIX := endif -endif # skip_build_from_source +include $(BUILD_SYSTEM)/executable_internal.mk +LOCAL_2ND_ARCH_VAR_PREFIX := |