From 7f126b7b90c8d189ba4f7643f2966d9120250c7e Mon Sep 17 00:00:00 2001 From: Bob Badour Date: Fri, 1 May 2020 08:10:42 -0700 Subject: Add METADATA to mini-emulator-x86_64: Apache2=NOTICE Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: Ib31a79ec8d4082194ac9612ea0266a03c12b63b1 --- METADATA | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 METADATA diff --git a/METADATA b/METADATA new file mode 100644 index 0000000..d97975c --- /dev/null +++ b/METADATA @@ -0,0 +1,3 @@ +third_party { + license_type: NOTICE +} -- cgit v1.2.3 From f5f84c4ef7cd1241136de82d6f148bd87999fd0c Mon Sep 17 00:00:00 2001 From: Roman Kiryanov Date: Thu, 14 May 2020 16:07:25 -0700 Subject: Retire device/generic/mini-emulator-x86_64 Bug: 154151802 Test: presubmit Signed-off-by: Roman Kiryanov Change-Id: I2cc15808d5195f336573e40c674a9bc7db46262f Merged-In: I2cc15808d5195f336573e40c674a9bc7db46262f --- AndroidProducts.mk | 21 --------------------- BoardConfig.mk | 16 ---------------- mini_emulator_x86_64.mk | 26 -------------------------- 3 files changed, 63 deletions(-) delete mode 100644 AndroidProducts.mk delete mode 100644 BoardConfig.mk delete mode 100644 mini_emulator_x86_64.mk 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 -- cgit v1.2.3