From 5a1598938fc491314af782052448116c2fab7bf5 Mon Sep 17 00:00:00 2001 From: Pirama Arumuga Nainar Date: Fri, 20 Apr 2018 15:18:22 -0700 Subject: [PATCH] Remove obsolete (and broken) targets. Bug: N/A Test: N/A Change-Id: I461e1adae9c0fec026f05cb890af2c4d8bd71e58 --- target/board/generic_mips/BoardConfig.mk | 76 ----------------- target/board/generic_mips/README.txt | 9 -- target/board/generic_mips/device.mk | 36 -------- target/board/generic_mips/system.prop | 6 -- target/board/generic_mips64/BoardConfig.mk | 95 ---------------------- target/board/generic_mips64/README.txt | 8 -- target/board/generic_mips64/device.mk | 35 -------- target/board/generic_mips64/system.prop | 6 -- target/product/AndroidProducts.mk | 12 --- target/product/aosp_mips.mk | 31 ------- target/product/aosp_mips64.mk | 44 ---------- target/product/full_mips.mk | 31 ------- target/product/generic_mips.mk | 26 ------ target/product/sdk_mips.mk | 21 ----- target/product/sdk_phone_mips.mk | 34 -------- target/product/sdk_phone_mips64.mk | 35 -------- 16 files changed, 505 deletions(-) delete mode 100644 target/board/generic_mips/BoardConfig.mk delete mode 100644 target/board/generic_mips/README.txt delete mode 100644 target/board/generic_mips/device.mk delete mode 100644 target/board/generic_mips/system.prop delete mode 100644 target/board/generic_mips64/BoardConfig.mk delete mode 100644 target/board/generic_mips64/README.txt delete mode 100644 target/board/generic_mips64/device.mk delete mode 100644 target/board/generic_mips64/system.prop delete mode 100644 target/product/aosp_mips.mk delete mode 100644 target/product/aosp_mips64.mk delete mode 100644 target/product/full_mips.mk delete mode 100644 target/product/generic_mips.mk delete mode 100644 target/product/sdk_mips.mk delete mode 100644 target/product/sdk_phone_mips.mk delete mode 100644 target/product/sdk_phone_mips64.mk diff --git a/target/board/generic_mips/BoardConfig.mk b/target/board/generic_mips/BoardConfig.mk deleted file mode 100644 index 523408b54..000000000 --- a/target/board/generic_mips/BoardConfig.mk +++ /dev/null @@ -1,76 +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. -# -# BoardConfig.mk -# -# Product-specific compile-time definitions. -# - -# The generic product target doesn't have any hardware-specific pieces. -TARGET_NO_BOOTLOADER := true -TARGET_NO_KERNEL := true - -TARGET_ARCH := mips -ifeq (,$(TARGET_ARCH_VARIANT)) -TARGET_ARCH_VARIANT := mips32r2-fp -endif -TARGET_CPU_ABI := mips - -# Make TARGET_CPU_VARIANT the same as TARGET_ARCH_VARIANT -TARGET_CPU_VARIANT := $(TARGET_ARCH_VARIANT) - -HAVE_HTC_AUDIO_DRIVER := true -BOARD_USES_GENERIC_AUDIO := true - -# no hardware camera -USE_CAMERA_STUB := true - -# Enable dex-preoptimization to speed up the first boot sequence -# of an SDK AVD. Note that this operation only works on Linux for now -ifeq ($(HOST_OS),linux) - ifeq ($(WITH_DEXPREOPT),) - WITH_DEXPREOPT := true - WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY := false - endif -endif - -TARGET_USES_HWC2 := true -NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3 - -# Build OpenGLES emulation guest and host libraries -BUILD_EMULATOR_OPENGL := true -BUILD_QEMU_IMAGES := true - -# Build and enable the OpenGL ES View renderer. When running on the emulator, -# the GLES renderer disables itself if host GL acceleration isn't available. -USE_OPENGL_RENDERER := true - -TARGET_USERIMAGES_USE_EXT4 := true -BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2147483648 # 2 GB -BOARD_USERDATAIMAGE_PARTITION_SIZE := 734003200 -TARGET_COPY_OUT_VENDOR := vendor -# ~100 MB vendor image. Please adjust system image / vendor image sizes -# when finalizing them. -BOARD_VENDORIMAGE_PARTITION_SIZE := 100000000 -BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4 -BOARD_FLASH_BLOCK_SIZE := 512 -TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true -DEVICE_MATRIX_FILE := device/generic/goldfish/compatibility_matrix.xml - -BOARD_SEPOLICY_DIRS += build/target/board/generic/sepolicy - -# Enable A/B update -TARGET_NO_RECOVERY := true -BOARD_BUILD_SYSTEM_ROOT_IMAGE := true diff --git a/target/board/generic_mips/README.txt b/target/board/generic_mips/README.txt deleted file mode 100644 index b31a8571a..000000000 --- a/target/board/generic_mips/README.txt +++ /dev/null @@ -1,9 +0,0 @@ -The "generic_mips" product defines a MIPS based non-hardware-specific -target without a kernel or bootloader. - -It can be used to build the entire user-level system, and -will work with the emulator, though sound will not work -(see the "emulator" product for that). - -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_mips/device.mk b/target/board/generic_mips/device.mk deleted file mode 100644 index a2633e187..000000000 --- a/target/board/generic_mips/device.mk +++ /dev/null @@ -1,36 +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 the product aspects that -# are specific to the emulator. - -PRODUCT_PROPERTY_OVERRIDES := \ - ro.ril.hsxpa=1 \ - ro.ril.gprsclass=10 - -PRODUCT_COPY_FILES := \ - device/generic/goldfish/data/etc/apns-conf.xml:system/etc/apns-conf.xml \ - device/generic/goldfish/camera/media_profiles.xml:system/etc/media_profiles.xml \ - frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:system/etc/media_codecs_google_audio.xml \ - frameworks/av/media/libstagefright/data/media_codecs_google_telephony.xml:system/etc/media_codecs_google_telephony.xml \ - frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:system/etc/media_codecs_google_video.xml \ - device/generic/goldfish/camera/media_codecs.xml:system/etc/media_codecs.xml \ - hardware/libhardware_legacy/audio/audio_policy.conf:system/etc/audio_policy.conf - -PRODUCT_PACKAGES := \ - audio.primary.goldfish \ - power.goldfish \ - vibrator.goldfish diff --git a/target/board/generic_mips/system.prop b/target/board/generic_mips/system.prop deleted file mode 100644 index 973db2c80..000000000 --- a/target/board/generic_mips/system.prop +++ /dev/null @@ -1,6 +0,0 @@ -# -# system.prop for generic sdk -# - -rild.libpath=/vendor/lib/libreference-ril.so -rild.libargs=-d /dev/ttyS0 diff --git a/target/board/generic_mips64/BoardConfig.mk b/target/board/generic_mips64/BoardConfig.mk deleted file mode 100644 index fa4c35534..000000000 --- a/target/board/generic_mips64/BoardConfig.mk +++ /dev/null @@ -1,95 +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. -# -# BoardConfig.mk -# -# Product-specific compile-time definitions. -# - -# The generic product target doesn't have any hardware-specific pieces. -TARGET_NO_BOOTLOADER := true -TARGET_NO_KERNEL := true - -TARGET_ARCH := mips64 -ifeq (,$(TARGET_ARCH_VARIANT)) -TARGET_ARCH_VARIANT := mips64r6 -endif -TARGET_CPU_ABI := mips64 - -TARGET_2ND_ARCH := mips -ifeq (,$(TARGET_2ND_ARCH_VARIANT)) -ifeq ($(TARGET_ARCH_VARIANT),mips64r6) -# Imgtec builds use 32r6 arch variant with Imgtec-maintained prebuilts/ndk library: -# TARGET_2ND_ARCH_VARIANT := mips32r6 -# Aosp builds lack full set of mips32r6 NDK prebuilts, so use 32r2 abi: -TARGET_2ND_ARCH_VARIANT := mips32r2-fp -else -TARGET_2ND_ARCH_VARIANT := mips32r2-fp -endif -endif -TARGET_2ND_CPU_ABI := mips - -# Make TARGET_XXX_CPU_VARIANT the same as TARGET_XXX_ARCH_VARIANT -TARGET_CPU_VARIANT := $(TARGET_ARCH_VARIANT) -TARGET_2ND_CPU_VARIANT := $(TARGET_2ND_ARCH_VARIANT) - -# The emulator (qemu) uses the Goldfish devices -HAVE_HTC_AUDIO_DRIVER := true -BOARD_USES_GENERIC_AUDIO := true - -# no hardware camera -USE_CAMERA_STUB := true - -# Enable dex-preoptimization to speed up the first boot sequence -# of an SDK AVD. Note that this operation only works on Linux for now -ifeq ($(HOST_OS),linux) - ifeq ($(WITH_DEXPREOPT),) - WITH_DEXPREOPT := true - WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY := false - endif -endif - -TARGET_USES_HWC2 := true -NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3 - -# Build OpenGLES emulation guest and host libraries -BUILD_EMULATOR_OPENGL := true -BUILD_QEMU_IMAGES := true - -# Build and enable the OpenGL ES View renderer. When running on the emulator, -# the GLES renderer disables itself if host GL acceleration isn't available. -USE_OPENGL_RENDERER := true - -TARGET_USERIMAGES_USE_EXT4 := true -BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1879048192 # 1.75 GB -BOARD_USERDATAIMAGE_PARTITION_SIZE := 1610612736 # 1.5 GB, lots of space for running tests -TARGET_COPY_OUT_VENDOR := vendor -# ~100 MB vendor image. Please adjust system image / vendor image sizes -# when finalizing them. -BOARD_VENDORIMAGE_PARTITION_SIZE := 100000000 -BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4 -BOARD_FLASH_BLOCK_SIZE := 512 -TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true -DEVICE_MATRIX_FILE := device/generic/goldfish/compatibility_matrix.xml - -BOARD_SEPOLICY_DIRS += build/target/board/generic/sepolicy - -DEX_PREOPT_DEFAULT := nostripping - -# Enable A/B update -TARGET_NO_RECOVERY := true -BOARD_BUILD_SYSTEM_ROOT_IMAGE := true - -BUILD_BROKEN_DUP_RULES := false diff --git a/target/board/generic_mips64/README.txt b/target/board/generic_mips64/README.txt deleted file mode 100644 index cd4e05b72..000000000 --- a/target/board/generic_mips64/README.txt +++ /dev/null @@ -1,8 +0,0 @@ -The "generic_mips64" product defines a MIPS64 based non-hardware-specific -target without a kernel or bootloader. - -It can be used to build the entire user-level system, and -will work with the emulator. - -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_mips64/device.mk b/target/board/generic_mips64/device.mk deleted file mode 100644 index 2ccbcbd18..000000000 --- a/target/board/generic_mips64/device.mk +++ /dev/null @@ -1,35 +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 the product aspects that -# are specific to the emulator. - -PRODUCT_PROPERTY_OVERRIDES := \ - ro.ril.hsxpa=1 \ - ro.ril.gprsclass=10 - -PRODUCT_COPY_FILES := \ - device/generic/goldfish/data/etc/apns-conf.xml:system/etc/apns-conf.xml \ - device/generic/goldfish/camera/media_profiles.xml:system/etc/media_profiles.xml \ - frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:system/etc/media_codecs_google_audio.xml \ - frameworks/av/media/libstagefright/data/media_codecs_google_telephony.xml:system/etc/media_codecs_google_telephony.xml \ - frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:system/etc/media_codecs_google_video.xml \ - device/generic/goldfish/camera/media_codecs.xml:system/etc/media_codecs.xml \ - hardware/libhardware_legacy/audio/audio_policy.conf:system/etc/audio_policy.conf - -PRODUCT_PACKAGES := \ - audio.primary.goldfish \ - power.goldfish diff --git a/target/board/generic_mips64/system.prop b/target/board/generic_mips64/system.prop deleted file mode 100644 index 4da69c092..000000000 --- a/target/board/generic_mips64/system.prop +++ /dev/null @@ -1,6 +0,0 @@ -# -# system.prop for generic mips64 sdk -# - -rild.libpath=/vendor/lib64/libreference-ril.so -rild.libargs=-d /dev/ttyS0 diff --git a/target/product/AndroidProducts.mk b/target/product/AndroidProducts.mk index daa97260a..89b66d31b 100644 --- a/target/product/AndroidProducts.mk +++ b/target/product/AndroidProducts.mk @@ -38,17 +38,13 @@ PRODUCT_MAKEFILES := \ $(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)/aosp_arm64.mk \ - $(LOCAL_DIR)/aosp_mips64.mk \ $(LOCAL_DIR)/aosp_x86_64.mk else PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/core.mk \ $(LOCAL_DIR)/generic.mk \ $(LOCAL_DIR)/generic_x86.mk \ - $(LOCAL_DIR)/generic_mips.mk \ $(LOCAL_DIR)/aosp_arm.mk \ $(LOCAL_DIR)/aosp_arm_a.mk \ $(LOCAL_DIR)/aosp_arm_ab.mk \ @@ -58,24 +54,18 @@ PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/aosp_x86_ab.mk \ $(LOCAL_DIR)/aosp_x86_arm.mk \ $(LOCAL_DIR)/full_x86.mk \ - $(LOCAL_DIR)/aosp_mips.mk \ - $(LOCAL_DIR)/full_mips.mk \ $(LOCAL_DIR)/aosp_arm64.mk \ $(LOCAL_DIR)/aosp_arm64_a.mk \ $(LOCAL_DIR)/aosp_arm64_ab.mk \ - $(LOCAL_DIR)/aosp_mips64.mk \ $(LOCAL_DIR)/aosp_x86_64.mk \ $(LOCAL_DIR)/aosp_x86_64_a.mk \ $(LOCAL_DIR)/aosp_x86_64_ab.mk \ $(LOCAL_DIR)/sdk_phone_armv7.mk \ $(LOCAL_DIR)/sdk_phone_x86.mk \ - $(LOCAL_DIR)/sdk_phone_mips.mk \ $(LOCAL_DIR)/sdk_phone_arm64.mk \ $(LOCAL_DIR)/sdk_phone_x86_64.mk \ - $(LOCAL_DIR)/sdk_phone_mips64.mk \ $(LOCAL_DIR)/sdk.mk \ $(LOCAL_DIR)/sdk_x86.mk \ - $(LOCAL_DIR)/sdk_mips.mk \ $(LOCAL_DIR)/sdk_arm64.mk \ $(LOCAL_DIR)/sdk_x86_64.mk endif @@ -83,7 +73,5 @@ endif COMMON_LUNCH_CHOICES := \ aosp_arm-eng \ aosp_arm64-eng \ - aosp_mips-eng \ - aosp_mips64-eng \ aosp_x86-eng \ aosp_x86_64-eng diff --git a/target/product/aosp_mips.mk b/target/product/aosp_mips.mk deleted file mode 100644 index 5ee618555..000000000 --- a/target/product/aosp_mips.mk +++ /dev/null @@ -1,31 +0,0 @@ -# -# Copyright 2017 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. -# - -PRODUCT_PROPERTY_OVERRIDES += \ - rild.libpath=/vendor/lib/libreference-ril.so - -# Note: the following lines need to stay at the beginning so that it can -# take priority and override the rules it inherit from other mk files -# see copy file rules in core/Makefile -PRODUCT_COPY_FILES += \ - development/sys-img/advancedFeatures.ini.arm:advancedFeatures.ini \ - prebuilts/qemu-kernel/mips/3.18/kernel-qemu2:kernel-ranchu \ - device/generic/goldfish/fstab.ranchu.mips:root/fstab.ranchu \ - device/generic/goldfish/fstab.ranchu.early.arm:root/fstab.ranchu.early - -include $(SRC_TARGET_DIR)/product/full_mips.mk - -PRODUCT_NAME := aosp_mips diff --git a/target/product/aosp_mips64.mk b/target/product/aosp_mips64.mk deleted file mode 100644 index 73d3731de..000000000 --- a/target/product/aosp_mips64.mk +++ /dev/null @@ -1,44 +0,0 @@ -# -# Copyright 2017 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. -# - -PRODUCT_PROPERTY_OVERRIDES += \ - rild.libpath=/vendor/lib64/libreference-ril.so - -# 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. - -# Note: the following lines need to stay at the beginning so that it can -# take priority and override the rules it inherit from other mk files -# see copy file rules in core/Makefile -PRODUCT_COPY_FILES += \ - development/sys-img/advancedFeatures.ini.arm:advancedFeatures.ini \ - prebuilts/qemu-kernel/mips64/3.18/kernel-qemu2:kernel-ranchu \ - device/generic/goldfish/fstab.ranchu.mips:root/fstab.ranchu \ - device/generic/goldfish/fstab.ranchu.early.arm:root/fstab.ranchu.early - -$(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/full_mips.mk b/target/product/full_mips.mk deleted file mode 100644 index 61734b43c..000000000 --- a/target/product/full_mips.mk +++ /dev/null @@ -1,31 +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 -# 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/aosp_base_telephony.mk) -$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_mips/device.mk) - -include $(SRC_TARGET_DIR)/product/emulator.mk - -# Overrides -PRODUCT_NAME := full_mips -PRODUCT_DEVICE := generic_mips -PRODUCT_BRAND := Android -PRODUCT_MODEL := AOSP on MIPS Emulator diff --git a/target/product/generic_mips.mk b/target/product/generic_mips.mk deleted file mode 100644 index 7b53d041a..000000000 --- a/target/product/generic_mips.mk +++ /dev/null @@ -1,26 +0,0 @@ -# -# Copyright (C) 2007 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 phone product that isn't specialized for a specific device. -# It includes the base Android platform. - -$(call inherit-product, $(SRC_TARGET_DIR)/product/generic_no_telephony.mk) -$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony.mk) - -# Overrides -PRODUCT_BRAND := generic_mips -PRODUCT_DEVICE := generic_mips -PRODUCT_NAME := generic_mips diff --git a/target/product/sdk_mips.mk b/target/product/sdk_mips.mk deleted file mode 100644 index 366994a31..000000000 --- a/target/product/sdk_mips.mk +++ /dev/null @@ -1,21 +0,0 @@ -# -# Copyright (C) 2014 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. -# - -# Don't modify this file - It's just an alias! - -$(call inherit-product, $(SRC_TARGET_DIR)/product/sdk_phone_mips.mk) - -PRODUCT_NAME := sdk_mips diff --git a/target/product/sdk_phone_mips.mk b/target/product/sdk_phone_mips.mk deleted file mode 100644 index 1cc2fe4b5..000000000 --- a/target/product/sdk_phone_mips.mk +++ /dev/null @@ -1,34 +0,0 @@ -# -# Copyright (C) 2012 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. - -$(call inherit-product, $(SRC_TARGET_DIR)/product/sdk_base.mk) - -# AOSP emulator images build the AOSP messaging app. -# Google API images override with the Google API app. -# See vendor/google/products/sdk_google_phone_*.mk -PRODUCT_PACKAGES += \ - messaging - -# Overrides -PRODUCT_BRAND := Android -PRODUCT_NAME := sdk_phone_mips -PRODUCT_DEVICE := generic_mips -PRODUCT_MODEL := Android SDK for Mips diff --git a/target/product/sdk_phone_mips64.mk b/target/product/sdk_phone_mips64.mk deleted file mode 100644 index e45d71bd8..000000000 --- a/target/product/sdk_phone_mips64.mk +++ /dev/null @@ -1,35 +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. - -$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) -$(call inherit-product, $(SRC_TARGET_DIR)/product/sdk_base.mk) - -# AOSP emulator images build the AOSP messaging app. -# Google API images override with the Google API app. -# See vendor/google/products/sdk_google_phone_*.mk -PRODUCT_PACKAGES += \ - messaging - -# Overrides -PRODUCT_BRAND := Android -PRODUCT_NAME := sdk_phone_mips64 -PRODUCT_DEVICE := generic_mips64 -PRODUCT_MODEL := Android SDK built for mips64