diff options
Diffstat (limited to 'build')
| -rw-r--r-- | build/core/build-binary.mk | 4 | ||||
| -rw-r--r-- | build/core/definitions.mk | 6 | ||||
| -rwxr-xr-x | build/tools/build-cxx-stl.sh | 6 | ||||
| -rwxr-xr-x | build/tools/build-ndk-sysroot.sh | 1 |
4 files changed, 8 insertions, 9 deletions
diff --git a/build/core/build-binary.mk b/build/core/build-binary.mk index ceb7e6714..7de5f294f 100644 --- a/build/core/build-binary.mk +++ b/build/core/build-binary.mk @@ -347,7 +347,7 @@ LOCAL_DEPENDENCY_DIRS := # all_source_patterns contains the list of filename patterns that correspond # to source files recognized by our build system -ifeq ($(TARGET_ARCH_ABI),x86) +ifneq ($(filter x86 x86_64, $(TARGET_ARCH_ABI)),) all_source_extensions := .c .s .S .asm $(LOCAL_CPP_EXTENSION) $(LOCAL_RS_EXTENSION) else all_source_extensions := .c .s .S $(LOCAL_CPP_EXTENSION) $(LOCAL_RS_EXTENSION) @@ -462,7 +462,7 @@ $(foreach src,$(filter $(all_rs_patterns),$(LOCAL_SRC_FILES)),\ $(call compile-rs-source,$(src),$(call get-rs-scriptc-name,$(src)),$(call get-rs-bc-name,$(src)),$(call get-rs-so-name,$(src)),$(call get-object-name,$(src)),$(RS_COMPAT))\ ) -ifeq ($(TARGET_ARCH_ABI),x86) +ifneq ($(filter x86 x86_64, $(TARGET_ARCH_ABI)),) $(foreach src,$(filter %.asm,$(LOCAL_SRC_FILES)), $(call compile-asm-source,$(src),$(call get-object-name,$(src)))) endif diff --git a/build/core/definitions.mk b/build/core/definitions.mk index 29b7b9872..e21100d38 100644 --- a/build/core/definitions.mk +++ b/build/core/definitions.mk @@ -1499,7 +1499,7 @@ ifeq ($$(_COMPAT),true) $$(_OBJ): $$(_RS_SRC) $$(LOCAL_MAKEFILE) $$(NDK_APP_APPLICATION_MK) $$(NDK_DEPENDENCIES_CONVERTER) $$(call host-echo-build-step,$$(PRIVATE_ABI),$$(PRIVATE_TEXT)) "$$(PRIVATE_MODULE) <= $$(notdir $$(PRIVATE_RS_SRC))" $$(hide) \ - cd $$(call host-path,$$(dir $$(PRIVATE_RS_SRC))) && $$(PRIVATE_RS_CC) -o $$(call host-path,$$(abspath $$(dir $$(PRIVATE_OBJ))))/ -d $$(abspath $$(call host-path,$$(dir $$(PRIVATE_OBJ)))) -MD -reflect-c++ $$(PRIVATE_RS_FLAGS) $$(notdir $$(PRIVATE_RS_SRC)) + cd $$(call host-path,$$(dir $$(PRIVATE_RS_SRC))) && $$(PRIVATE_RS_CC) -o $$(call host-path,$$(abspath $$(dir $$(PRIVATE_OBJ))))/ -d $$(abspath $$(call host-path,$$(dir $$(PRIVATE_OBJ)))) -MD -reflect-c++ -target-api $(strip $(subst android-,,$(APP_PLATFORM))) $$(PRIVATE_RS_FLAGS) $$(notdir $$(PRIVATE_RS_SRC)) $$(hide) \ $$(PRIVATE_RS_BCC) -O3 -o $$(call host-path,$$(PRIVATE_BC_OBJ)) -fPIC -shared -rt-path $$(call host-path,$(SYSROOT_LINK)/usr/lib/rs/libclcore.bc) -mtriple $$(PRIVATE_RS_TRIPLE) $$(call host-path,$$(PRIVATE_BC_SRC)) && \ $$(PRIVATE_CXX) -shared -Wl,-soname,librs.$$(PRIVATE_BC_SO) -nostdlib $$(call host-path,$$(PRIVATE_BC_OBJ)) $$(call host-path,$(SYSROOT_LINK)/usr/lib/rs/libcompiler_rt.a) -o $$(call host-path,$$(PRIVATE_OUT)/librs.$$(PRIVATE_BC_SO)) -L $$(call host-path,$(SYSROOT_LINK)/usr/lib) -L $$(call host-path,$(SYSROOT_LINK)/usr/lib/rs) $$(PRIVATE_LDFLAGS) -lRSSupport -lm -lc && \ @@ -1509,7 +1509,7 @@ else $$(_OBJ): $$(_RS_SRC) $$(LOCAL_MAKEFILE) $$(NDK_APP_APPLICATION_MK) $$(NDK_DEPENDENCIES_CONVERTER) $$(call host-echo-build-step,$$(PRIVATE_ABI),$$(PRIVATE_TEXT)) "$$(PRIVATE_MODULE) <= $$(notdir $$(PRIVATE_RS_SRC))" $$(hide) \ - cd $$(call host-path,$$(dir $$(PRIVATE_RS_SRC))) && $$(PRIVATE_RS_CC) -o $$(call host-path,$$(abspath $$(dir $$(PRIVATE_OBJ))))/ -d $$(abspath $$(call host-path,$$(dir $$(PRIVATE_OBJ)))) -MD -reflect-c++ $$(PRIVATE_RS_FLAGS) $$(notdir $$(PRIVATE_RS_SRC)) + cd $$(call host-path,$$(dir $$(PRIVATE_RS_SRC))) && $$(PRIVATE_RS_CC) -o $$(call host-path,$$(abspath $$(dir $$(PRIVATE_OBJ))))/ -d $$(abspath $$(call host-path,$$(dir $$(PRIVATE_OBJ)))) -MD -reflect-c++ -target-api $(strip $(subst android-,,$(APP_PLATFORM))) $$(PRIVATE_RS_FLAGS) $$(notdir $$(PRIVATE_RS_SRC)) $$(hide) \ $$(PRIVATE_CXX) -MMD -MP -MF $$(call convert-deps,$$(PRIVATE_DEPS)) $$(PRIVATE_CPPFLAGS) $$(call host-path,$$(PRIVATE_CPP_SRC)) -o $$(call host-path,$$(PRIVATE_OBJ)) \ $$(call cmd-convert-deps,$$(PRIVATE_DEPS)) @@ -1635,7 +1635,7 @@ _FLAGS := $$(call host-c-includes,$$(LOCAL_C_INCLUDES) $$(LOCAL_PATH)) \ $$(LOCAL_ASMFLAGS) \ $$(NDK_APP_ASMFLAGS) \ $$(call host-c-includes,$$($(my)C_INCLUDES)) \ - -f elf32 -m x86 + $$(if $$(filter x86_64, $$(TARGET_ARCH_ABI)), -f elf64, -f elf32 -m x86) _TEXT := Assemble $$(call get-src-file-text,$1) _CC := $$(NDK_CCACHE) $$(TARGET_ASM) diff --git a/build/tools/build-cxx-stl.sh b/build/tools/build-cxx-stl.sh index ca1cb9d1c..eaf6a9ffe 100755 --- a/build/tools/build-cxx-stl.sh +++ b/build/tools/build-cxx-stl.sh @@ -494,14 +494,14 @@ HIDDEN_VISIBILITY_FLAGS="-fvisibility=hidden -fvisibility-inlines-hidden" # By default, all static libraries include hidden ELF symbols, except # if one uses the --visible-static option. if [ -z "$VISIBLE_STATIC" ]; then + STATIC_CONLYFLAGS="$HIDDEN_VISIBILITY_FLAGS" STATIC_CXXFLAGS="$HIDDEN_VISIBILITY_FLAGS" else + STATIC_CONLYFLAGS= STATIC_CXXFLAGS= fi -SHARED_CXXFLAGS= -# Mainlly deal with android_support.a -STATIC_CONLYFLAGS="$HIDDEN_VISIBILITY_FLAGS" SHARED_CONLYFLAGS="$HIDDEN_VISIBILITY_FLAGS" +SHARED_CXXFLAGS= # build_stl_libs_for_abi diff --git a/build/tools/build-ndk-sysroot.sh b/build/tools/build-ndk-sysroot.sh index 13acda0a8..dfb5de0ab 100755 --- a/build/tools/build-ndk-sysroot.sh +++ b/build/tools/build-ndk-sysroot.sh @@ -142,7 +142,6 @@ rm -rf $COMMON_ROOT mkdir -p $COMMON_ROOT LIB_ROOT=$SYSROOT/usr/lib -INCLUDE_ROOT=$SYSROOT/usr/include install_file () { |