summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoman Kiryanov <rkir@google.com>2020-05-18 04:00:36 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-05-18 04:00:36 +0000
commitea23d936c3c4d556ff13d1d01aa760cafa59b02f (patch)
tree4b825dc642cb6eb9a060e54bf8d69288fbee4904
parent0e0dc9eefb1226163a215ac3bac16dedf15d88f9 (diff)
parent0914fc21dacf384bc03a0e676e6648e260590c23 (diff)
downloadmini-emulator-x86_64-ea23d936c3c4d556ff13d1d01aa760cafa59b02f.tar.gz
Retire device/generic/mini-emulator-x86_64 am: 0914fc21daandroid-mainline-12.0.0_r112android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12aml_tz2_305400500aml_tz2_305400300aml_tz2_305400100aml_tz2_304500300aml_tz2_303900110aml_tz2_303900102aml_tz2_303800002aml_tz2_303800001aml_tz2_303200001android12-mainline-tzdata2-releaseandroid11-mainline-tethering-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseaml_tz2_305400100
Change-Id: I32f579a39f9566a99d907d549a79916a0bf70a6b
-rw-r--r--AndroidProducts.mk21
-rw-r--r--BoardConfig.mk16
-rw-r--r--mini_emulator_x86_64.mk26
3 files changed, 0 insertions, 63 deletions
diff --git a/AndroidProducts.mk b/AndroidProducts.mk
deleted file mode 100644
index 8b818f7..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_64.mk
-
-COMMON_LUNCH_CHOICES := \
- mini_emulator_x86_64-userdebug
diff --git a/BoardConfig.mk b/BoardConfig.mk
deleted file mode 100644
index d006028..0000000
--- a/BoardConfig.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# BoardConfig.mk
-#
-# Product-specific compile-time definitions.
-#
-
-# same as x86 except HAL
-include device/generic/x86_64/BoardConfig.mk
-
-# Build OpenGLES emulation libraries
-BUILD_EMULATOR := true
-BUILD_EMULATOR_OPENGL := true
-BUILD_EMULATOR_OPENGL_DRIVER := true
-
-# share the same one across all mini-emulators
-BOARD_EGL_CFG := device/generic/goldfish-opengl/system/egl/egl.cfg
-
diff --git a/mini_emulator_x86_64.mk b/mini_emulator_x86_64.mk
deleted file mode 100644
index f2414a3..0000000
--- a/mini_emulator_x86_64.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_64/mini_x86_64.mk)
-
-$(call inherit-product, device/generic/mini-emulator-armv7-a-neon/mini_emulator_common.mk)
-
-PRODUCT_NAME := mini_emulator_x86_64
-PRODUCT_DEVICE := mini-emulator-x86_64
-PRODUCT_BRAND := Android
-PRODUCT_MODEL := mini-emulator-x86_64
-
-LOCAL_KERNEL := prebuilts/qemu-kernel/x86_64/kernel-qemu
-PRODUCT_COPY_FILES += \
- $(LOCAL_KERNEL):kernel