From dd3a27394f4a33601ac1afc3fa1bbdb4cb6a3610 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Mon, 8 Jan 2018 15:26:16 -0800 Subject: [PATCH] Remove armv5te This architecture only existed for unbundled use, but even the NDK is removing support in their r17 release, so just remove support for it. Test: build/soong/build_test.bash -only-config Test: check buildserver configs, I don't see anything still using armv5 Change-Id: Ic183b510c9ada94438bd4cc2b9362fa438a29ced --- core/combo/TARGET_linux-arm.mk | 2 +- core/combo/arch/arm/armv5te-vfp.mk | 7 ------ core/combo/arch/arm/armv5te.mk | 4 ---- envsetup.sh | 7 +++--- tapasHelp.sh | 2 +- target/board/generic_armv5/AndroidBoard.mk | 17 --------------- target/board/generic_armv5/BoardConfig.mk | 23 -------------------- target/board/generic_armv5/README.txt | 5 ----- target/board/generic_armv5/device.mk | 17 --------------- target/board/generic_armv5/system.prop | 6 ------ target/product/AndroidProducts.mk | 1 - target/product/generic_armv5.mk | 25 ---------------------- 12 files changed, 5 insertions(+), 111 deletions(-) delete mode 100644 core/combo/arch/arm/armv5te-vfp.mk delete mode 100644 core/combo/arch/arm/armv5te.mk delete mode 100644 target/board/generic_armv5/AndroidBoard.mk delete mode 100644 target/board/generic_armv5/BoardConfig.mk delete mode 100644 target/board/generic_armv5/README.txt delete mode 100644 target/board/generic_armv5/device.mk delete mode 100644 target/board/generic_armv5/system.prop delete mode 100644 target/product/generic_armv5.mk diff --git a/core/combo/TARGET_linux-arm.mk b/core/combo/TARGET_linux-arm.mk index 73b1c046dc..01cf3f5951 100644 --- a/core/combo/TARGET_linux-arm.mk +++ b/core/combo/TARGET_linux-arm.mk @@ -50,7 +50,7 @@ ifneq (,$(filter $(TARGET_$(combo_2nd_arch_prefix)CPU_VARIANT), $(KNOWN_ARMv8_CO endif ifeq ($(strip $(TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT)),) -TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT := armv5te +$(error TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT must be set) endif TARGET_ARCH_SPECIFIC_MAKEFILE := $(BUILD_COMBOS)/arch/$(TARGET_$(combo_2nd_arch_prefix)ARCH)/$(TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT).mk diff --git a/core/combo/arch/arm/armv5te-vfp.mk b/core/combo/arch/arm/armv5te-vfp.mk deleted file mode 100644 index 75299ac245..0000000000 --- a/core/combo/arch/arm/armv5te-vfp.mk +++ /dev/null @@ -1,7 +0,0 @@ -# At the moment, use the same settings than the one -# for armv5te, since TARGET_ARCH_VARIANT := armv5te-vfp -# will only be used to select an optimized VFP-capable assembly -# interpreter loop for Dalvik. -# -include $(BUILD_COMBOS)/arch/arm/armv5te.mk - diff --git a/core/combo/arch/arm/armv5te.mk b/core/combo/arch/arm/armv5te.mk deleted file mode 100644 index bd75695301..0000000000 --- a/core/combo/arch/arm/armv5te.mk +++ /dev/null @@ -1,4 +0,0 @@ -# Configuration for Linux on ARM. -# Generating binaries for the ARMv5TE architecture and higher -# - diff --git a/envsetup.sh b/envsetup.sh index 394df65641..576c234330 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -8,7 +8,7 @@ Invoke ". build/envsetup.sh" from your shell to add the following functions to y Selects as the product to build, and as the variant to build, and stores those selections in the environment to be read by subsequent invocations of 'm' etc. -- tapas: tapas [ ...] [arm|x86|mips|armv5|arm64|x86_64|mips64] [eng|userdebug|user] +- tapas: tapas [ ...] [arm|x86|mips|arm64|x86_64|mips64] [eng|userdebug|user] - croot: Changes directory to the top of the tree. - m: Makes from the top of the tree. - mm: Builds all of the modules in the current directory, but not their dependencies. @@ -661,10 +661,10 @@ complete -F _lunch lunch function tapas() { local showHelp="$(echo $* | xargs -n 1 echo | \grep -E '^(help)$' | xargs)" - local arch="$(echo $* | xargs -n 1 echo | \grep -E '^(arm|x86|mips|armv5|arm64|x86_64|mips64)$' | xargs)" + local arch="$(echo $* | xargs -n 1 echo | \grep -E '^(arm|x86|mips|arm64|x86_64|mips64)$' | xargs)" local variant="$(echo $* | xargs -n 1 echo | \grep -E '^(user|userdebug|eng)$' | xargs)" local density="$(echo $* | xargs -n 1 echo | \grep -E '^(ldpi|mdpi|tvdpi|hdpi|xhdpi|xxhdpi|xxxhdpi|alldpi)$' | xargs)" - local apps="$(echo $* | xargs -n 1 echo | \grep -E -v '^(user|userdebug|eng|arm|x86|mips|armv5|arm64|x86_64|mips64|ldpi|mdpi|tvdpi|hdpi|xhdpi|xxhdpi|xxxhdpi|alldpi)$' | xargs)" + local apps="$(echo $* | xargs -n 1 echo | \grep -E -v '^(user|userdebug|eng|arm|x86|mips|arm64|x86_64|mips64|ldpi|mdpi|tvdpi|hdpi|xhdpi|xxhdpi|xxxhdpi|alldpi)$' | xargs)" if [ "$showHelp" != "" ]; then $(gettop)/build/make/tapasHelp.sh @@ -688,7 +688,6 @@ function tapas() case $arch in x86) product=aosp_x86;; mips) product=aosp_mips;; - armv5) product=generic_armv5;; arm64) product=aosp_arm64;; x86_64) product=aosp_x86_64;; mips64) product=aosp_mips64;; diff --git a/tapasHelp.sh b/tapasHelp.sh index 058ac1db3e..38b3e345bb 100755 --- a/tapasHelp.sh +++ b/tapasHelp.sh @@ -6,7 +6,7 @@ SCRIPT_DIR="${PWD}" cd ../.. TOP="${PWD}" -message='usage: tapas [ ...] [arm|x86|mips|armv5|arm64|x86_64|mips64] [eng|userdebug|user] +message='usage: tapas [ ...] [arm|x86|mips|arm64|x86_64|mips64] [eng|userdebug|user] tapas selects individual apps to be built by the Android build system. Unlike "lunch", "tapas" does not request the building of images for a device. diff --git a/target/board/generic_armv5/AndroidBoard.mk b/target/board/generic_armv5/AndroidBoard.mk deleted file mode 100644 index 7daff274ac..0000000000 --- a/target/board/generic_armv5/AndroidBoard.mk +++ /dev/null @@ -1,17 +0,0 @@ -# -# Copyright (C) 2011 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. -# - --include build/target/board/generic/AndroidBoard.mk diff --git a/target/board/generic_armv5/BoardConfig.mk b/target/board/generic_armv5/BoardConfig.mk deleted file mode 100644 index 016937a688..0000000000 --- a/target/board/generic_armv5/BoardConfig.mk +++ /dev/null @@ -1,23 +0,0 @@ -# -# Copyright (C) 2011 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. -# - -include build/target/board/generic/BoardConfig.mk - -TARGET_ARCH_VARIANT := armv5te -TARGET_CPU_ABI := armeabi -TARGET_CPU_ABI2 := - -WITH_DEXPREOPT := false diff --git a/target/board/generic_armv5/README.txt b/target/board/generic_armv5/README.txt deleted file mode 100644 index 25d590af07..0000000000 --- a/target/board/generic_armv5/README.txt +++ /dev/null @@ -1,5 +0,0 @@ -The "generic_armv5" product defines a non-hardware-specific target -without a kernel or bootloader. - -It is not a product "base class"; no other products inherit -from it or use it in any way. diff --git a/target/board/generic_armv5/device.mk b/target/board/generic_armv5/device.mk deleted file mode 100644 index 7c4aaf2082..0000000000 --- a/target/board/generic_armv5/device.mk +++ /dev/null @@ -1,17 +0,0 @@ -# -# Copyright (C) 2011 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. -# - -include build/target/board/generic/device.mk diff --git a/target/board/generic_armv5/system.prop b/target/board/generic_armv5/system.prop deleted file mode 100644 index 137a0f9b1f..0000000000 --- a/target/board/generic_armv5/system.prop +++ /dev/null @@ -1,6 +0,0 @@ -# -# system.prop for generic sdk -# - -rild.libpath=/system/lib/libreference-ril.so -rild.libargs=-d /dev/ttyS0 diff --git a/target/product/AndroidProducts.mk b/target/product/AndroidProducts.mk index 9e2adee014..85330b30a7 100644 --- a/target/product/AndroidProducts.mk +++ b/target/product/AndroidProducts.mk @@ -36,7 +36,6 @@ ifneq ($(TARGET_BUILD_APPS),) PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/aosp_arm.mk \ $(LOCAL_DIR)/full.mk \ - $(LOCAL_DIR)/generic_armv5.mk \ $(LOCAL_DIR)/aosp_x86.mk \ $(LOCAL_DIR)/full_x86.mk \ $(LOCAL_DIR)/aosp_mips.mk \ diff --git a/target/product/generic_armv5.mk b/target/product/generic_armv5.mk deleted file mode 100644 index daa321a565..0000000000 --- a/target/product/generic_armv5.mk +++ /dev/null @@ -1,25 +0,0 @@ -# -# Copyright (C) 2011 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. -# - -# This is a generic product that isn't specialized for a specific device. -# It includes the base Android platform. - -$(call inherit-product, $(SRC_TARGET_DIR)/product/generic.mk) - -# Overrides -PRODUCT_BRAND := generic_armv5 -PRODUCT_DEVICE := generic_armv5 -PRODUCT_NAME := generic_armv5