From f05c4f75244e82b60942567a7c6ab18551635265 Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Thu, 31 Jan 2013 11:16:57 -0800 Subject: [PATCH] Resurrect generic_armv5 But only for unbundled build. Add it to tapas arch options. Bug: 8108463 Change-Id: I53cd63c6ab2113fee3992650b561658231ea9921 --- envsetup.sh | 7 +++--- target/board/generic_armv5/AndroidBoard.mk | 17 +++++++++++++++ target/board/generic_armv5/BoardConfig.mk | 24 +++++++++++++++++++++ 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 ++++++++++++++++++++++ 8 files changed, 99 insertions(+), 3 deletions(-) create mode 100644 target/board/generic_armv5/AndroidBoard.mk create mode 100644 target/board/generic_armv5/BoardConfig.mk create mode 100644 target/board/generic_armv5/README.txt create mode 100644 target/board/generic_armv5/device.mk create mode 100644 target/board/generic_armv5/system.prop create mode 100644 target/product/generic_armv5.mk diff --git a/envsetup.sh b/envsetup.sh index 17cd346cc..e2b6b1341 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -2,7 +2,7 @@ function hmm() { cat <- -- tapas: tapas [ ...] [arm|x86|mips] [eng|userdebug|user] +- tapas: tapas [ ...] [arm|x86|mips|armv5] [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. @@ -538,9 +538,9 @@ complete -F _lunch lunch # Run tapas with one ore more app names (from LOCAL_PACKAGE_NAME) function tapas() { - local arch=$(echo -n $(echo $* | xargs -n 1 echo | \grep -E '^(arm|x86|mips)$')) + local arch=$(echo -n $(echo $* | xargs -n 1 echo | \grep -E '^(arm|x86|mips|armv5)$')) local variant=$(echo -n $(echo $* | xargs -n 1 echo | \grep -E '^(user|userdebug|eng)$')) - local apps=$(echo -n $(echo $* | xargs -n 1 echo | \grep -E -v '^(user|userdebug|eng|arm|x86|mips)$')) + local apps=$(echo -n $(echo $* | xargs -n 1 echo | \grep -E -v '^(user|userdebug|eng|arm|x86|mips|armv5)$')) if [ $(echo $arch | wc -w) -gt 1 ]; then echo "tapas: Error: Multiple build archs supplied: $arch" @@ -555,6 +555,7 @@ function tapas() case $arch in x86) product=full_x86;; mips) product=full_mips;; + armv5) product=generic_armv5;; esac if [ -z "$variant" ]; then variant=eng diff --git a/target/board/generic_armv5/AndroidBoard.mk b/target/board/generic_armv5/AndroidBoard.mk new file mode 100644 index 000000000..7daff274a --- /dev/null +++ b/target/board/generic_armv5/AndroidBoard.mk @@ -0,0 +1,17 @@ +# +# 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 new file mode 100644 index 000000000..95fb559db --- /dev/null +++ b/target/board/generic_armv5/BoardConfig.mk @@ -0,0 +1,24 @@ +# +# 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 := +ARCH_ARM_HAVE_TLS_REGISTER := false + +WITH_DEXPREOPT := false diff --git a/target/board/generic_armv5/README.txt b/target/board/generic_armv5/README.txt new file mode 100644 index 000000000..25d590af0 --- /dev/null +++ b/target/board/generic_armv5/README.txt @@ -0,0 +1,5 @@ +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 new file mode 100644 index 000000000..7c4aaf208 --- /dev/null +++ b/target/board/generic_armv5/device.mk @@ -0,0 +1,17 @@ +# +# 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 new file mode 100644 index 000000000..137a0f9b1 --- /dev/null +++ b/target/board/generic_armv5/system.prop @@ -0,0 +1,6 @@ +# +# 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 5206aa143..b0e22e155 100644 --- a/target/product/AndroidProducts.mk +++ b/target/product/AndroidProducts.mk @@ -35,6 +35,7 @@ ifneq ($(TARGET_BUILD_APPS),) PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/full.mk \ + $(LOCAL_DIR)/generic_armv5.mk \ $(LOCAL_DIR)/full_x86.mk \ $(LOCAL_DIR)/full_mips.mk else diff --git a/target/product/generic_armv5.mk b/target/product/generic_armv5.mk new file mode 100644 index 000000000..daa321a56 --- /dev/null +++ b/target/product/generic_armv5.mk @@ -0,0 +1,25 @@ +# +# 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