Merge "Remove armv5te"
This commit is contained in:
Treehugger Robot
Gerrit Code Review
commit
139f458ced
12 changed files with 5 additions and 111 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
# Configuration for Linux on ARM.
|
||||
# Generating binaries for the ARMv5TE architecture and higher
|
||||
#
|
||||
|
||||
|
|
@ -8,7 +8,7 @@ Invoke ". build/envsetup.sh" from your shell to add the following functions to y
|
|||
Selects <product_name> as the product to build, and <build_variant> as the variant to
|
||||
build, and stores those selections in the environment to be read by subsequent
|
||||
invocations of 'm' etc.
|
||||
- tapas: tapas [<App1> <App2> ...] [arm|x86|mips|armv5|arm64|x86_64|mips64] [eng|userdebug|user]
|
||||
- tapas: tapas [<App1> <App2> ...] [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;;
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ SCRIPT_DIR="${PWD}"
|
|||
cd ../..
|
||||
TOP="${PWD}"
|
||||
|
||||
message='usage: tapas [<App1> <App2> ...] [arm|x86|mips|armv5|arm64|x86_64|mips64] [eng|userdebug|user]
|
||||
message='usage: tapas [<App1> <App2> ...] [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.
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
@ -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.
|
||||
|
|
@ -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
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
#
|
||||
# system.prop for generic sdk
|
||||
#
|
||||
|
||||
rild.libpath=/system/lib/libreference-ril.so
|
||||
rild.libargs=-d /dev/ttyS0
|
||||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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
|
||||
Loading…
Reference in a new issue