tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

am 8213b719: am 6e92ade0: am db24577b: Merge "Work in progress to enable build system support for Clang."

Browse source 
* commit '8213b719c8e5e4f757a4898213eb624622c11526':
  Work in progress to enable build system support for Clang.
This commit is contained in:
Colin Cross 2014-03-16 00:02:44 +00:00 committed by Android Git Automerger
commit c48da22b6d
3 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/clang/TARGET_arm64.mk
View file

@ -1,7 +1,7 @@
include $(BUILD_SYSTEM)/clang/arm64.mk include $(BUILD_SYSTEM)/clang/arm64.mk
CLANG_CONFIG_arm64_TARGET_TRIPLE := aarch64-linux-androideabi CLANG_CONFIG_arm64_TARGET_TRIPLE := aarch64-linux-android
CLANG_CONFIG_arm64_TARGET_TOOLCHAIN_PREFIX := \ CLANG_CONFIG_arm64_TARGET_TOOLCHAIN_PREFIX := \
$(TARGET_TOOLCHAIN_ROOT)/$(CLANG_CONFIG_arm64_TARGET_TRIPLE)/bin $(TARGET_TOOLCHAIN_ROOT)/$(CLANG_CONFIG_arm64_TARGET_TRIPLE)/bin
@ -51,4 +51,4 @@ CLANG_TARGET_GLOBAL_LDFLAGS := \
$(CLANG_CONFIG_arm64_TARGET_EXTRA_LDFLAGS) $(CLANG_CONFIG_arm64_TARGET_EXTRA_LDFLAGS)
$(warning Incorrect arm64 RS_TRIPLE, fix me!) $(warning Incorrect arm64 RS_TRIPLE, fix me!)
RS_TRIPLE := armv7-none-linux-gnueabi RS_TRIPLE := aarch64-linux-android

2
core/combo/TARGET_linux-arm64.mk
View file

@ -48,7 +48,7 @@ $(error Unknown ARM architecture version: $(TARGET_ARCH_VARIANT))
endif endif
# TODO: Enable Clang when aarch64 prebuilt is added # TODO: Enable Clang when aarch64 prebuilt is added
WITHOUT_TARGET_CLANG := true # WITHOUT_TARGET_CLANG := true
include $(TARGET_ARCH_SPECIFIC_MAKEFILE) include $(TARGET_ARCH_SPECIFIC_MAKEFILE)

5
target/board/generic_arm64/BoardConfig.mk
View file

@ -55,9 +55,4 @@ BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
BOARD_FLASH_BLOCK_SIZE := 512 BOARD_FLASH_BLOCK_SIZE := 512
TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true
# FIXME
# Temporarily disable linking against compiler_rt until there is an arm64
# version
WITHOUT_LIBCOMPILER_RT := true
BUILD_EMULATOR := false BUILD_EMULATOR := false