Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8213b719 authored Mar 15, 2014 by Colin Cross Committed by Android Git Automerger Mar 15, 2014

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

* commit '6e92ade0':
  Work in progress to enable build system support for Clang.

parents 228f8afc 6e92ade0

core/clang/TARGET_arm64.mk

+2 −2

Original line number	Diff line number	Diff line

		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 := \
		$(TARGET_TOOLCHAIN_ROOT)/$(CLANG_CONFIG_arm64_TARGET_TRIPLE)/bin

		@@ -51,4 +51,4 @@ CLANG_TARGET_GLOBAL_LDFLAGS := \
		$(CLANG_CONFIG_arm64_TARGET_EXTRA_LDFLAGS)

		$(warning Incorrect arm64 RS_TRIPLE, fix me!)
		RS_TRIPLE := armv7-none-linux-gnueabi
		RS_TRIPLE := aarch64-linux-android

core/combo/TARGET_linux-arm64.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -48,7 +48,7 @@ $(error Unknown ARM architecture version: $(TARGET_ARCH_VARIANT))
		endif

		# TODO: Enable Clang when aarch64 prebuilt is added
		WITHOUT_TARGET_CLANG := true
		# WITHOUT_TARGET_CLANG := true

		include $(TARGET_ARCH_SPECIFIC_MAKEFILE)

target/board/generic_arm64/BoardConfig.mk

+0 −5

Original line number	Diff line number	Diff line
		@@ -55,9 +55,4 @@ BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
		BOARD_FLASH_BLOCK_SIZE := 512
		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