Merge "Remove unused mips workarounds." am: 055d7286ee (99ec86e6) · Commits · e / os / android_build

core/binary.mk

+4 −28

Original line number	Diff line number	Diff line
		@@ -110,19 +110,8 @@ ifneq ($(LOCAL_SDK_VERSION),)
		# Make sure we've built the NDK.
		my_additional_dependencies += $(SOONG_OUT_DIR)/ndk_base.timestamp

		# mips32r6 is not supported by the NDK. No released NDK contains these
		# libraries, but the r10 in prebuilts/ndk had a local hack to add them :(
		#
		# We need to find a real solution to this problem, but until we do just drop
		# mips32r6 things back to r10 to get the tree building again.
		ifeq (mips32r6,$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH_VARIANT))
		ifeq ($(LOCAL_NDK_VERSION), current)
		LOCAL_NDK_VERSION := r10
		endif
		endif

		my_arch := $(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)
		ifneq (,$(filter arm64 mips64 x86_64,$(my_arch)))
		ifneq (,$(filter arm64 x86_64,$(my_arch)))
		my_min_sdk_version := 21
		else
		my_min_sdk_version := $(MIN_SUPPORTED_SDK_VERSION)
		@@ -156,17 +145,11 @@ ifneq ($(LOCAL_SDK_VERSION),)
		$(my_built_ndk)/sysroot/usr/include/$(my_ndk_triple) \
		$(my_ndk_sysroot)/usr/include \

		# x86_64 and and mips64 are both multilib toolchains, so their libraries are
		# x86_64 is a multilib toolchain, so their libraries are
		# installed in /usr/lib64. Aarch64, on the other hand, is not a multilib
		# compiler, so its libraries are in /usr/lib.
		#
		# Mips32r6 is yet another variation, with libraries installed in libr6.
		#
		# For the rest, the libraries are installed simply to /usr/lib.
		ifneq (,$(filter x86_64 mips64,$(my_arch)))
		ifneq (,$(filter x86_64,$(my_arch)))
		my_ndk_libdir_name := lib64
		else ifeq (mips32r6,$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH_VARIANT))
		my_ndk_libdir_name := libr6
		else
		my_ndk_libdir_name := lib
		endif
		@@ -180,11 +163,7 @@ ifneq ($(LOCAL_SDK_VERSION),)
		# hashes (which are much faster!), but shipping to older devices requires
		# the old style hash. Fortunately, we can build with both and it'll work
		# anywhere.
		#
		# This is not currently supported on MIPS architectures.
		ifeq (,$(filter mips mips64,$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)))
		my_ldflags += -Wl,--hash-style=both
		endif

		# We don't want to expose the relocation packer to the NDK just yet.
		LOCAL_PACK_MODULE_RELOCATIONS := false
		@@ -195,9 +174,6 @@ ifneq ($(LOCAL_SDK_VERSION),)
		my_ndk_stl_shared_lib_fullpath :=
		my_ndk_stl_static_lib :=
		my_cpu_variant := $(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)CPU_ABI)
		ifeq (mips32r6,$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH_VARIANT))
		my_cpu_variant := mips32r6
		endif
		LOCAL_NDK_STL_VARIANT := $(strip $(LOCAL_NDK_STL_VARIANT))
		ifeq (,$(LOCAL_NDK_STL_VARIANT))
		LOCAL_NDK_STL_VARIANT := system

core/build-system.html

+0 −2

Original line number	Diff line number	Diff line
		@@ -467,8 +467,6 @@ set to and some examples.</p>
		<b>TARGET_ARCH</b><br/>
		arm<br/>
		arm64<br/>
		mips<br/>
		mips64<br/>
		x86<br/>
		x86_64
		</td>

core/clang/TARGET_mips.mk

deleted100644 → 0

+0 −9

Original line number	Diff line number	Diff line
		$(clang_2nd_arch_prefix)RS_TRIPLE := renderscript32-linux-androideabi
		$(clang_2nd_arch_prefix)RS_TRIPLE_CFLAGS :=
		RS_COMPAT_TRIPLE := mipsel-linux-android

		$(clang_2nd_arch_prefix)TARGET_LIBPROFILE_RT := $(LLVM_RTLIB_PATH)/libclang_rt.profile-mipsel-android.a

		# Address sanitizer clang config
		$(clang_2nd_arch_prefix)ADDRESS_SANITIZER_LINKER := /system/bin/linker_asan
		$(clang_2nd_arch_prefix)ADDRESS_SANITIZER_LINKER_FILE := /system/bin/bootstrap/linker_asan

core/clang/TARGET_mips64.mk

deleted100644 → 0

+0 −9

Original line number	Diff line number	Diff line
		RS_TRIPLE := renderscript64-linux-android
		RS_TRIPLE_CFLAGS :=
		RS_COMPAT_TRIPLE := mips64el-linux-android

		TARGET_LIBPROFILE_RT := $(LLVM_RTLIB_PATH)/libclang_rt.profile-mips64el-android.a

		# Address sanitizer clang config
		$(clang_2nd_arch_prefix)ADDRESS_SANITIZER_LINKER := /system/bin/linker_asan64
		$(clang_2nd_arch_prefix)ADDRESS_SANITIZER_LINKER_FILE := /system/bin/bootstrap/linker_asan64

core/combo/TARGET_linux-mips.mk

deleted100644 → 0

+0 −44

Original line number	Diff line number	Diff line
		#
		# Copyright (C) 2010 The Android Open Source Project
		#
		# Licensed under the Apache License, Version 2.0 (the "License");
		# you may not use this file except in compliance with the License.
		# You may obtain a copy of the License at
		#
		# http://www.apache.org/licenses/LICENSE-2.0
		#
		# Unless required by applicable law or agreed to in writing, software
		# distributed under the License is distributed on an "AS IS" BASIS,
		# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		# See the License for the specific language governing permissions and
		# limitations under the License.
		#

		# Configuration for Linux on MIPS.
		# Included by combo/select.mk

		# You can set TARGET_ARCH_VARIANT to use an arch version other
		# than mips32r2-fp. Each value should correspond to a file named
		# $(BUILD_COMBOS)/arch/<name>.mk which must contain
		# makefile variable definitions. Their
		# purpose is to allow module Android.mk files to selectively compile
		# different versions of code based upon the funtionality and
		# instructions available in a given architecture version.
		#
		# The blocks also define specific arch_variant_cflags, which
		# include defines, and compiler settings for the given architecture
		# version.
		#
		ifeq ($(strip $(TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT)),)
		TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT := mips32r2-fp
		endif

		include $(BUILD_SYSTEM)/combo/fdo.mk

		define $(combo_var_prefix)transform-shared-lib-to-toc
		$(call _gen_toc_command_for_elf,$(1),$(2))
		endef

		$(combo_2nd_arch_prefix)TARGET_PACK_MODULE_RELOCATIONS := true

		$(combo_2nd_arch_prefix)TARGET_LINKER := /system/bin/linker