Merge "Retire device/generic/mini-emulator-x86" am: 88ffb97113

Change-Id: I06b1f3411c5a664c3394ced65847aa610784e7c6
diff --git a/AndroidProducts.mk b/AndroidProducts.mk
deleted file mode 100644
index 6726eb6..0000000
--- a/AndroidProducts.mk
+++ /dev/null
@@ -1,21 +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.
-#
-
-PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/mini_emulator_x86.mk
-
-COMMON_LUNCH_CHOICES := \
-    mini_emulator_x86-userdebug
diff --git a/BoardConfig.mk b/BoardConfig.mk
deleted file mode 100644
index 382cb22..0000000
--- a/BoardConfig.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# BoardConfig.mk
-#
-# Product-specific compile-time definitions.
-#
-
-# same as x86 except HAL
-include device/generic/x86/BoardConfig.mk
diff --git a/mini_emulator_x86.mk b/mini_emulator_x86.mk
deleted file mode 100644
index 4ca64e4..0000000
--- a/mini_emulator_x86.mk
+++ /dev/null
@@ -1,26 +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.
-
-$(call inherit-product, device/generic/x86/mini_x86.mk)
-
-$(call inherit-product, device/generic/mini-emulator-armv7-a-neon/mini_emulator_common.mk)
-
-PRODUCT_NAME := mini_emulator_x86
-PRODUCT_DEVICE := mini-emulator-x86
-PRODUCT_BRAND := Android
-PRODUCT_MODEL := mini-emulator-x86
-
-LOCAL_KERNEL := prebuilts/qemu-kernel/x86/kernel-qemu
-PRODUCT_COPY_FILES += \
-    $(LOCAL_KERNEL):kernel