summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2020-05-19 01:01:06 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2020-05-19 01:01:06 +0000
commit3c723907acc6a9af98ee46b05eed4b69c3f26e4c (patch)
tree4b825dc642cb6eb9a060e54bf8d69288fbee4904
parentdc0e1610a68c17e4aaf3a2b06bf18062e8e5e4d0 (diff)
parentf4db79332cbdc1eb506f38fe0376a144bbfd54f3 (diff)
downloadmini-emulator-x86-android11-security-release.tar.gz
Snap for 6507440 from f4db79332cbdc1eb506f38fe0376a144bbfd54f3 to rvc-releaseandroid-vts-11.0_r9android-vts-11.0_r8android-vts-11.0_r7android-vts-11.0_r6android-vts-11.0_r5android-vts-11.0_r4android-vts-11.0_r3android-vts-11.0_r2android-vts-11.0_r16android-vts-11.0_r15android-vts-11.0_r14android-vts-11.0_r13android-vts-11.0_r12android-vts-11.0_r11android-vts-11.0_r10android-vts-11.0_r1android-security-11.0.0_r76android-security-11.0.0_r75android-security-11.0.0_r74android-security-11.0.0_r73android-security-11.0.0_r72android-security-11.0.0_r71android-security-11.0.0_r70android-security-11.0.0_r69android-security-11.0.0_r68android-security-11.0.0_r67android-security-11.0.0_r66android-security-11.0.0_r65android-security-11.0.0_r64android-security-11.0.0_r63android-security-11.0.0_r62android-security-11.0.0_r61android-security-11.0.0_r60android-security-11.0.0_r59android-security-11.0.0_r58android-security-11.0.0_r57android-security-11.0.0_r56android-security-11.0.0_r55android-security-11.0.0_r54android-security-11.0.0_r53android-security-11.0.0_r52android-security-11.0.0_r51android-security-11.0.0_r50android-security-11.0.0_r49android-security-11.0.0_r1android-cts-11.0_r9android-cts-11.0_r8android-cts-11.0_r7android-cts-11.0_r6android-cts-11.0_r5android-cts-11.0_r4android-cts-11.0_r3android-cts-11.0_r2android-cts-11.0_r16android-cts-11.0_r15android-cts-11.0_r14android-cts-11.0_r13android-cts-11.0_r12android-cts-11.0_r11android-cts-11.0_r10android-cts-11.0_r1android-11.0.0_r5android-11.0.0_r4android-11.0.0_r3android-11.0.0_r25android-11.0.0_r2android-11.0.0_r17android-11.0.0_r1android11-tests-releaseandroid11-security-releaseandroid11-s1-releaseandroid11-release
Change-Id: I052c014b1c2221861da3231bc4a2224d98a5a648
-rw-r--r--AndroidProducts.mk21
-rw-r--r--BoardConfig.mk7
-rw-r--r--mini_emulator_x86.mk26
3 files changed, 0 insertions, 54 deletions
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