diff options
Diffstat (limited to 'linker/Android.mk')
| -rw-r--r-- | linker/Android.mk | 37 |
1 files changed, 20 insertions, 17 deletions
diff --git a/linker/Android.mk b/linker/Android.mk index d1773a8..bdc54de 100644 --- a/linker/Android.mk +++ b/linker/Android.mk @@ -14,31 +14,34 @@ LOCAL_SRC_FILES:= \ linker.cpp \ linker_environ.cpp \ linker_phdr.cpp \ - rt.cpp + rt.cpp \ -LOCAL_LDFLAGS := -shared -Wl,--exclude-libs,ALL +LOCAL_LDFLAGS := \ + -shared \ + -Wl,-Bsymbolic \ + -Wl,--exclude-libs,ALL \ -LOCAL_CFLAGS += -fno-stack-protector \ - -Wstrict-overflow=5 \ - -fvisibility=hidden \ - -Wall -Wextra -Werror +LOCAL_CFLAGS += \ + -fno-stack-protector \ + -Wstrict-overflow=5 \ + -fvisibility=hidden \ + -Wall -Wextra -Werror \ -# We need to access Bionic private headers in the linker. -LOCAL_CFLAGS += -I$(LOCAL_PATH)/../libc/ +LOCAL_CONLYFLAGS += \ + -std=gnu99 \ -ifeq ($(TARGET_ARCH),arm) - LOCAL_CFLAGS += -DANDROID_ARM_LINKER -endif +LOCAL_CPPFLAGS += \ + -std=gnu++11 \ -ifeq ($(TARGET_ARCH),x86) - LOCAL_CFLAGS += -DANDROID_X86_LINKER -endif +# We need to access Bionic private headers in the linker. +LOCAL_CFLAGS += -I$(LOCAL_PATH)/../libc/ -ifeq ($(TARGET_ARCH),mips) - LOCAL_CFLAGS += -DANDROID_MIPS_LINKER +ifeq ($(TARGET_IS_64_BIT),true) + LOCAL_MODULE := linker64 +else + LOCAL_MODULE := linker endif -LOCAL_MODULE:= linker LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_STATIC_LIBRARIES := libc_nomalloc |