asm $(LOCAL_CPP_EXTENSION) $(LOCAL_RS_EXTENSION) else all_source_extensions :=. +# Linker should behave similarly +ifneq ($(filter armeabi%, $(TARGET_ARCH_ABI)),) +ifneq ($(APP_OPTIM),debug) + LOCAL_LDFLAGS += -mthumb +endif +endif endif ifeq ($(LOCAL_ARM_MODE),thumb) arm_sources := $(empty) -339,7 +356,7 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 :=. arm prefix # to a source file name to indicate that it should be defined in either -301,6 +310,14 (,$(LOCAL_PCH)) $(call tag-src-files,$(LOCAL_PCH),arm) endif +else +# For arm, all sources are compiled in thumb mode by default in release mode. +++ -216,6 +216,15 endif +# Uncomment the following to enable multithreaded ld.gold by default for arm, x86 and x86_64 +# unless (conservatively) -fuse-ld= is specified +# +#ifneq (,$(filter $(TARGET_ARCH_ABI), armeabi armeabi-v7a armeabi-v7a-hard x86 x86_64)) +# ifeq (,$(filter -fuse-ld=,$(TARGET_LDFLAGS) $(LOCAL_LDFLAGS) $(NDK_APP_LDFLAGS))) +# LOCAL_LDFLAGS += -Wl,-threads +# endif +#endif + # The original Android build system allows you to use the. +++ -119,16 +119,6 APP_PLATFORM := android-21 endif -#ifneq (,$(filter 13,$(APP_PLATFORM_LEVEL))) -# override APP_PLATFORM := android-12 -#endif -#ifneq (,$(filter 15,$(APP_PLATFORM_LEVEL))) -# override APP_PLATFORM := android-14 -#endif -#ifneq (,$(filter 17,$(APP_PLATFORM_LEVEL))) -# override APP_PLATFORM := android-16 -#endif - ifneq ($(strip $(subst android-,$(APP_PLATFORM))),$(APP_PLATFORM_LEVEL)) $(call ndk_log, Adjusting APP_PLATFORM android-$(APP_PLATFORM_LEVEL) to $(APP_PLATFORM)) endif diff -git a/ndk/build/core/build-binary.mk b/ndk/build/core/build-binary.mk +++ -1 +1 (64-bit) +r10e-rc4 (64-bit) diff -git a/ndk/build/core/add-application.mk b/ndk/build/core/add-application.mk diff -git a/ndk/RELEASE.TXT b/ndk/RELEASE.TXT Edited stlport to force GCC to do "proper" inlining decisions - (see /377433) - sources/cxx-stl/stlport/stlport/stl/_construct.h - sources/cxx-stl/stlport/stlport/stl/_vector.c - Cherry-picked to Arm, Arm64 and Mips - Cherry-picked - Cherry-picked - Cherry-picked -Cherry-picked more recent version of the aarch64 toolchain containing - + (anything under android-16) - Cherry-picked to fix component build at -Oz. Also deleted sources/cxx-stl/gnu-libstdc++/4.6/ for the same reason. +++ -1,7 +1,7 Android Tools (SDK/NDK) URL: Versions: - NDK r10c + NDK r10e-rc4 Android SDK Platform API 22 rev 2 Android SDK Tools 24.3 Android SDK Platform-tools 22 -20,26 +20,7 ndk/ - Removed old android platforms in platforms/ - (anything under android-14) - Removed GCC 4.6 toolchains in toolchains/ - as they are deprecated and no longer used in Chromium.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |