From 324c123500d0f0da0ce92b246c65386050618563 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Queru Date: Fri, 22 Mar 2013 15:53:54 -0700 Subject: [PATCH] Rename AOSP builds to aosp_* Change-Id: If609f66904ac560bc7a6e9ff9a43c2e039525687 --- envsetup.sh | 10 +++++----- target/product/AndroidProducts.mk | 6 ++++++ target/product/aosp_arm.mk | 18 ++++++++++++++++++ target/product/aosp_base.mk | 16 ++++++++++++++++ target/product/aosp_base_telephony.mk | 16 ++++++++++++++++ target/product/aosp_mips.mk | 18 ++++++++++++++++++ target/product/aosp_x86.mk | 18 ++++++++++++++++++ target/product/full.mk | 4 ++-- target/product/full_base_telephony.mk | 2 +- target/product/full_mips.mk | 4 ++-- target/product/full_x86.mk | 4 ++-- target/product/vbox_x86.mk | 2 +- 12 files changed, 105 insertions(+), 13 deletions(-) create mode 100644 target/product/aosp_arm.mk create mode 100644 target/product/aosp_base.mk create mode 100644 target/product/aosp_base_telephony.mk create mode 100644 target/product/aosp_mips.mk create mode 100644 target/product/aosp_x86.mk diff --git a/envsetup.sh b/envsetup.sh index 542d7b2351..61bdc3daf8 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -426,10 +426,10 @@ function add_lunch_combo() } # add the default one here -add_lunch_combo full-eng -add_lunch_combo full_x86-eng +add_lunch_combo aosp_arm-eng +add_lunch_combo aosp_x86-eng +add_lunch_combo aosp_mips-eng add_lunch_combo vbox_x86-eng -add_lunch_combo full_mips-eng function print_lunch_menu() { @@ -458,7 +458,7 @@ function lunch() answer=$1 else print_lunch_menu - echo -n "Which would you like? [full-eng] " + echo -n "Which would you like? [aosp_arm-eng] " read answer fi @@ -466,7 +466,7 @@ function lunch() if [ -z "$answer" ] then - selection=full-eng + selection=aosp_arm-eng elif (echo -n $answer | grep -q -e "^[0-9][0-9]*$") then if [ $answer -le ${#LUNCH_MENU_CHOICES[@]} ] diff --git a/target/product/AndroidProducts.mk b/target/product/AndroidProducts.mk index b0e22e1558..55f0a3a0fb 100644 --- a/target/product/AndroidProducts.mk +++ b/target/product/AndroidProducts.mk @@ -34,9 +34,12 @@ # Unbundled apps will be built with the most generic product config. 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 $(LOCAL_DIR)/full_mips.mk else PRODUCT_MAKEFILES := \ @@ -44,8 +47,11 @@ PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/generic.mk \ $(LOCAL_DIR)/generic_x86.mk \ $(LOCAL_DIR)/generic_mips.mk \ + $(LOCAL_DIR)/aosp_arm.mk \ $(LOCAL_DIR)/full.mk \ + $(LOCAL_DIR)/aosp_x86.mk \ $(LOCAL_DIR)/full_x86.mk \ + $(LOCAL_DIR)/aosp_mips.mk \ $(LOCAL_DIR)/full_mips.mk \ $(LOCAL_DIR)/vbox_x86.mk \ $(LOCAL_DIR)/sdk.mk \ diff --git a/target/product/aosp_arm.mk b/target/product/aosp_arm.mk new file mode 100644 index 0000000000..86b715cd9c --- /dev/null +++ b/target/product/aosp_arm.mk @@ -0,0 +1,18 @@ +# +# Copyright 2013 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. +# +$(call inherit-product, $(SRC_TARGET_DIR)/product/full.mk) + +PRODUCT_NAME := aosp_arm diff --git a/target/product/aosp_base.mk b/target/product/aosp_base.mk new file mode 100644 index 0000000000..075c1d3f8f --- /dev/null +++ b/target/product/aosp_base.mk @@ -0,0 +1,16 @@ +# +# Copyright 2013 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. +# +$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk) diff --git a/target/product/aosp_base_telephony.mk b/target/product/aosp_base_telephony.mk new file mode 100644 index 0000000000..f326a00159 --- /dev/null +++ b/target/product/aosp_base_telephony.mk @@ -0,0 +1,16 @@ +# +# Copyright 2013 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. +# +$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk) diff --git a/target/product/aosp_mips.mk b/target/product/aosp_mips.mk new file mode 100644 index 0000000000..ceeb433730 --- /dev/null +++ b/target/product/aosp_mips.mk @@ -0,0 +1,18 @@ +# +# Copyright 2013 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. +# +$(call inherit-product, $(SRC_TARGET_DIR)/product/full_mips.mk) + +PRODUCT_NAME := aosp_mips diff --git a/target/product/aosp_x86.mk b/target/product/aosp_x86.mk new file mode 100644 index 0000000000..3e9b018a25 --- /dev/null +++ b/target/product/aosp_x86.mk @@ -0,0 +1,18 @@ +# +# Copyright 2013 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. +# +$(call inherit-product, $(SRC_TARGET_DIR)/product/full_x86.mk) + +PRODUCT_NAME := aosp_x86 diff --git a/target/product/full.mk b/target/product/full.mk index a4075d46df..b66ae92a53 100644 --- a/target/product/full.mk +++ b/target/product/full.mk @@ -19,7 +19,7 @@ # build quite specifically for the emulator, and might not be # entirely appropriate to inherit from for on-device configurations. -$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk) $(call inherit-product, $(SRC_TARGET_DIR)/board/generic/device.mk) include $(SRC_TARGET_DIR)/product/emulator.mk @@ -28,4 +28,4 @@ include $(SRC_TARGET_DIR)/product/emulator.mk PRODUCT_NAME := full PRODUCT_DEVICE := generic PRODUCT_BRAND := Android -PRODUCT_MODEL := Full Android on Emulator +PRODUCT_MODEL := AOSP on ARM Emulator diff --git a/target/product/full_base_telephony.mk b/target/product/full_base_telephony.mk index 5899c8ca93..f98e9a2699 100644 --- a/target/product/full_base_telephony.mk +++ b/target/product/full_base_telephony.mk @@ -29,5 +29,5 @@ PRODUCT_PROPERTY_OVERRIDES := \ PRODUCT_COPY_FILES := \ device/generic/goldfish/data/etc/apns-conf.xml:system/etc/apns-conf.xml -$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/telephony.mk) diff --git a/target/product/full_mips.mk b/target/product/full_mips.mk index 9418ba260b..61734b43cc 100644 --- a/target/product/full_mips.mk +++ b/target/product/full_mips.mk @@ -19,7 +19,7 @@ # mips build quite specifically for the emulator, and might not be # entirely appropriate to inherit from for on-device configurations. -$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk) $(call inherit-product, $(SRC_TARGET_DIR)/board/generic_mips/device.mk) include $(SRC_TARGET_DIR)/product/emulator.mk @@ -28,4 +28,4 @@ include $(SRC_TARGET_DIR)/product/emulator.mk PRODUCT_NAME := full_mips PRODUCT_DEVICE := generic_mips PRODUCT_BRAND := Android -PRODUCT_MODEL := Full MIPS Android on Emulator +PRODUCT_MODEL := AOSP on MIPS Emulator diff --git a/target/product/full_x86.mk b/target/product/full_x86.mk index 6e229a5c71..4dff713424 100644 --- a/target/product/full_x86.mk +++ b/target/product/full_x86.mk @@ -23,7 +23,7 @@ # that isn't a wifi connection. This will instruct init.rc to enable the # network connection so that you can use it with ADB -$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk) $(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86/device.mk) include $(SRC_TARGET_DIR)/product/emulator.mk @@ -41,4 +41,4 @@ PRODUCT_PACKAGES += \ PRODUCT_NAME := full_x86 PRODUCT_DEVICE := generic_x86 PRODUCT_BRAND := Android -PRODUCT_MODEL := Full Android on x86 Emulator +PRODUCT_MODEL := AOSP on IA Emulator diff --git a/target/product/vbox_x86.mk b/target/product/vbox_x86.mk index a49277486e..a7d1b65804 100644 --- a/target/product/vbox_x86.mk +++ b/target/product/vbox_x86.mk @@ -22,7 +22,7 @@ ifdef NET_ETH0_STARTONBOOT PRODUCT_PROPERTY_OVERRIDES += net.eth0.startonboot=1 endif -$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base.mk) $(call inherit-product, $(SRC_TARGET_DIR)/board/vbox_x86/device.mk) PRODUCT_PACKAGES += \