From 0a76df5ce744ee396d77ce30719212f72b1d31b6 Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Mon, 8 Jun 2015 11:57:26 -0700 Subject: [PATCH] Remove the unnecessary full_x86_64 and full_mips64. For historical reason, the aosp_* products were named full_*. We keep the full, full_x86 and full_mips in case some tools still reference these legacy names; But no reason the have the full_* product names for the new 64-bit archs. Change-Id: I240ed0c6ded0ded2d80603bd0c5ff24750999afc --- core/envsetup.mk | 2 +- envsetup.sh | 8 +++--- target/product/AndroidProducts.mk | 1 - target/product/aosp_mips64.mk | 16 ++++++++++- target/product/aosp_x86_64.mk | 29 +++++++++++++++++++- target/product/full_mips64.mk | 32 ---------------------- target/product/full_x86_64.mk | 45 ------------------------------- 7 files changed, 48 insertions(+), 85 deletions(-) delete mode 100644 target/product/full_mips64.mk delete mode 100755 target/product/full_x86_64.mk diff --git a/core/envsetup.mk b/core/envsetup.mk index 015cfee490..990a28df2f 100644 --- a/core/envsetup.mk +++ b/core/envsetup.mk @@ -22,7 +22,7 @@ CORRECT_BUILD_ENV_SEQUENCE_NUMBER := 10 # NOTE: This will be overridden in product_config.mk if make # was invoked with a PRODUCT-xxx-yyy goal. ifeq ($(TARGET_PRODUCT),) -TARGET_PRODUCT := full +TARGET_PRODUCT := aosp_arm endif diff --git a/envsetup.sh b/envsetup.sh index 88c7c5c9fd..bd46b59274 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -347,7 +347,7 @@ function chooseproduct() if [ "x$TARGET_PRODUCT" != x ] ; then default_value=$TARGET_PRODUCT else - default_value=full + default_value=aosp_arm fi export TARGET_PRODUCT= @@ -594,10 +594,10 @@ function tapas() return fi - local product=full + local product=aosp_arm case $arch in - x86) product=full_x86;; - mips) product=full_mips;; + x86) product=aosp_x86;; + mips) product=aosp_mips;; armv5) product=generic_armv5;; arm64) product=aosp_arm64;; x86_64) product=aosp_x86_64;; diff --git a/target/product/AndroidProducts.mk b/target/product/AndroidProducts.mk index ac5902cc7f..69edc72e4c 100644 --- a/target/product/AndroidProducts.mk +++ b/target/product/AndroidProducts.mk @@ -59,7 +59,6 @@ PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/aosp_arm64.mk \ $(LOCAL_DIR)/aosp_mips64.mk \ $(LOCAL_DIR)/aosp_x86_64.mk \ - $(LOCAL_DIR)/full_x86_64.mk \ $(LOCAL_DIR)/sdk_phone_armv7.mk \ $(LOCAL_DIR)/sdk_phone_x86.mk \ $(LOCAL_DIR)/sdk_phone_mips.mk \ diff --git a/target/product/aosp_mips64.mk b/target/product/aosp_mips64.mk index 3a6026c301..723c59f434 100644 --- a/target/product/aosp_mips64.mk +++ b/target/product/aosp_mips64.mk @@ -13,6 +13,20 @@ # See the License for the specific language governing permissions and # limitations under the License. # -$(call inherit-product, $(SRC_TARGET_DIR)/product/full_mips64.mk) +# This is a build configuration for a full-featured build of the +# Open-Source part of the tree. It's geared toward a US-centric +# mips64 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/core_64_bit.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_mips64/device.mk) + +include $(SRC_TARGET_DIR)/product/emulator.mk + +# Overrides PRODUCT_NAME := aosp_mips64 +PRODUCT_DEVICE := generic_mips64 +PRODUCT_BRAND := Android +PRODUCT_MODEL := AOSP on MIPS64 Emulator diff --git a/target/product/aosp_x86_64.mk b/target/product/aosp_x86_64.mk index 5a12c08d09..a14508f7b7 100644 --- a/target/product/aosp_x86_64.mk +++ b/target/product/aosp_x86_64.mk @@ -13,6 +13,33 @@ # See the License for the specific language governing permissions and # limitations under the License. # -$(call inherit-product, $(SRC_TARGET_DIR)/product/full_x86_64.mk) +# This is a build configuration for a full-featured build of the +# Open-Source part of the tree. It's geared toward a US-centric +# build quite specifically for the emulator, and might not be +# entirely appropriate to inherit from for on-device configurations. + +# If running on an emulator or some other device that has a LAN connection +# 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/core_64_bit.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86_64/device.mk) + +include $(SRC_TARGET_DIR)/product/emulator.mk + +ifdef NET_ETH0_STARTONBOOT + PRODUCT_PROPERTY_OVERRIDES += net.eth0.startonboot=1 +endif + +# Ensure we package the BIOS files too. +PRODUCT_PACKAGES += \ + bios.bin \ + vgabios-cirrus.bin \ + +# Overrides PRODUCT_NAME := aosp_x86_64 +PRODUCT_DEVICE := generic_x86_64 +PRODUCT_BRAND := Android +PRODUCT_MODEL := AOSP on IA x86_64 Emulator diff --git a/target/product/full_mips64.mk b/target/product/full_mips64.mk deleted file mode 100644 index e813e41b34..0000000000 --- a/target/product/full_mips64.mk +++ /dev/null @@ -1,32 +0,0 @@ -# -# Copyright (C) 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. -# - -# This is a build configuration for a full-featured build of the -# Open-Source part of the tree. It's geared toward a US-centric -# mips64 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/core_64_bit.mk) -$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk) -$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_mips64/device.mk) - -include $(SRC_TARGET_DIR)/product/emulator.mk - -# Overrides -PRODUCT_NAME := full_mips64 -PRODUCT_DEVICE := generic_mips64 -PRODUCT_BRAND := Android -PRODUCT_MODEL := AOSP on MIPS64 Emulator diff --git a/target/product/full_x86_64.mk b/target/product/full_x86_64.mk deleted file mode 100755 index 051a86ed6e..0000000000 --- a/target/product/full_x86_64.mk +++ /dev/null @@ -1,45 +0,0 @@ -# -# Copyright (C) 2009 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 build configuration for a full-featured build of the -# Open-Source part of the tree. It's geared toward a US-centric -# build quite specifically for the emulator, and might not be -# entirely appropriate to inherit from for on-device configurations. - -# If running on an emulator or some other device that has a LAN connection -# 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/core_64_bit.mk) -$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk) -$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86_64/device.mk) - -include $(SRC_TARGET_DIR)/product/emulator.mk - -ifdef NET_ETH0_STARTONBOOT - PRODUCT_PROPERTY_OVERRIDES += net.eth0.startonboot=1 -endif - -# Ensure we package the BIOS files too. -PRODUCT_PACKAGES += \ - bios.bin \ - vgabios-cirrus.bin \ - -# Overrides -PRODUCT_NAME := full_x86_64 -PRODUCT_DEVICE := generic_x86_64 -PRODUCT_BRAND := Android -PRODUCT_MODEL := AOSP on IA x86_64 Emulator