From 6287d9eea59969685f94056239f8714519961411 Mon Sep 17 00:00:00 2001 From: Bob Badour Date: Fri, 1 May 2020 08:09:09 -0700 Subject: Add METADATA to mini-emulator-arm64: Apache2=NOTICE Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: I59f0e80d0a9b10cc6d33e2a936bda0fe2f0439c0 --- 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 b8f8878df2b7fed0a5978abb3556b54de2b9045b Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Thu, 22 Aug 2019 18:15:33 -0700 Subject: Don't install libGLES_android This is going away Bug: 154346346 Test: presubmit Merged-In: I4865e1ffeceea457c6a1e9791c70bdcecd045383 Change-Id: I77a4e6591e733a793f7110137cbb6b9c1aca463c Signed-off-by: Roman Kiryanov --- mini_emulator_common.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/mini_emulator_common.mk b/mini_emulator_common.mk index edf8166..11bd39e 100644 --- a/mini_emulator_common.mk +++ b/mini_emulator_common.mk @@ -25,7 +25,6 @@ PRODUCT_PACKAGES += \ vibrator.goldfish \ qemu-props \ qemud \ - libGLES_android \ libGLESv1_CM_emulation \ lib_renderControl_enc \ libEGL_emulation \ -- cgit v1.2.3 From 8391226f57fff9f2e30796e3c7e765daab82efab Mon Sep 17 00:00:00 2001 From: Roman Kiryanov Date: Wed, 13 May 2020 12:44:05 -0700 Subject: Retire device/generic/mini-emulator-arm64 Bug: 154151802 Test: presubmit Signed-off-by: Roman Kiryanov Change-Id: I64352b79cfa48edd146277e5453924bd0428f9f1 Merged-In: I64352b79cfa48edd146277e5453924bd0428f9f1 --- AndroidProducts.mk | 20 ------------ BoardConfig.mk | 21 ------------ init.mini-emulator.rc | 87 ------------------------------------------------- mini_emulator_arm64.mk | 26 --------------- mini_emulator_common.mk | 52 ----------------------------- 5 files changed, 206 deletions(-) delete mode 100644 AndroidProducts.mk delete mode 100644 BoardConfig.mk delete mode 100644 init.mini-emulator.rc delete mode 100644 mini_emulator_arm64.mk delete mode 100644 mini_emulator_common.mk diff --git a/AndroidProducts.mk b/AndroidProducts.mk deleted file mode 100644 index 36c2e97..0000000 --- a/AndroidProducts.mk +++ /dev/null @@ -1,20 +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. -# - -PRODUCT_MAKEFILES := \ - $(LOCAL_DIR)/mini_emulator_arm64.mk - -COMMON_LUNCH_CHOICES := \ - mini_emulator_arm64-userdebug diff --git a/BoardConfig.mk b/BoardConfig.mk deleted file mode 100644 index 7703b41..0000000 --- a/BoardConfig.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. -# - -# BoardConfig.mk -# -# Product-specific compile-time definitions. -# - -include device/generic/arm64/BoardConfig.mk diff --git a/init.mini-emulator.rc b/init.mini-emulator.rc deleted file mode 100644 index 7d63615..0000000 --- a/init.mini-emulator.rc +++ /dev/null @@ -1,87 +0,0 @@ -on init - symlink /sdcard /storage/sdcard0 - - mount debugfs debugfs /sys/kernel/debug - -on post-fs-data - # Set indication (checked by vold) that we have finished this action - setprop vold.post_fs_data_done 1 - # to force to start sdcard - class_start late_start - -on boot - setprop ARGH ARGH - setprop net.eth0.gw 10.0.2.2 - setprop net.eth0.dns1 10.0.2.3 - setprop net.dns1 10.0.2.3 - setprop net.gprs.local-ip 10.0.2.15 - setprop ro.radio.use-ppp no - setprop ro.build.product generic - setprop ro.product.device generic - -# fake some battery state - setprop status.battery.state Slow - setprop status.battery.level 5 - setprop status.battery.level_raw 50 - setprop status.battery.level_scale 9 - -# disable some daemons the emulator doesn't want - stop dund - stop akmd - -# start essential services - start qemud - start goldfish-logcat - start goldfish-setup - - setprop ro.setupwizard.mode EMULATOR - -# enable Google-specific location features, -# like NetworkLocationProvider and LocationCollector - setprop ro.com.google.locationfeatures 1 - -# For the emulator, which bypasses Setup Wizard, you can specify -# account info for the device via these two properties. Google -# Login Service will insert these accounts into the database when -# it is created (ie, after a data wipe). -# -# setprop ro.config.hosted_account username@hosteddomain.org:password -# setprop ro.config.google_account username@gmail.com:password -# -# You MUST have a Google account on the device, and you MAY -# additionally have a hosted account. No other configuration is -# supported, and arbitrary breakage may result if you specify -# something else. - -on fs - mount_all /fstab.goldfish - -service goldfish-setup /system/etc/init.goldfish.sh - user root - group root - oneshot - -# The qemu-props program is used to set various system -# properties on boot. It must be run early during the boot -# process to avoid race conditions with other daemons that -# might read them (e.g. surface flinger), so define it in -# class 'core' -# -service qemu-props /system/bin/qemu-props - class core - user root - group root - oneshot - -service qemud /system/bin/qemud - socket qemud stream 666 - oneshot - -# -Q is a special logcat option that forces the -# program to check wether it runs on the emulator -# if it does, it redirects its output to the device -# named by the androidboot.console kernel option -# if not, is simply exits immediately - -service goldfish-logcat /system/bin/logcat -Q - oneshot diff --git a/mini_emulator_arm64.mk b/mini_emulator_arm64.mk deleted file mode 100644 index 58577da..0000000 --- a/mini_emulator_arm64.mk +++ /dev/null @@ -1,26 +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. - -$(call inherit-product, device/generic/arm64/mini_arm64.mk) - -$(call inherit-product, device/generic/mini-emulator-armv7-a-neon/mini_emulator_common.mk) - -PRODUCT_NAME := mini_emulator_arm64 -PRODUCT_DEVICE := mini-emulator-arm64 -PRODUCT_BRAND := Android -PRODUCT_MODEL := mini-arm64 - -LOCAL_KERNEL := prebuilts/qemu-kernel/arm/kernel-qemu-armv7 -PRODUCT_COPY_FILES += \ - $(LOCAL_KERNEL):kernel diff --git a/mini_emulator_common.mk b/mini_emulator_common.mk deleted file mode 100644 index 11bd39e..0000000 --- a/mini_emulator_common.mk +++ /dev/null @@ -1,52 +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. - -# common stuffs across mini_emulators - -PRODUCT_PACKAGES += \ - audio.primary.goldfish \ - camera.goldfish \ - gps.goldfish \ - gralloc.goldfish \ - lights.goldfish \ - power.goldfish \ - sensors.goldfish \ - vibrator.goldfish \ - qemu-props \ - qemud \ - libGLESv1_CM_emulation \ - lib_renderControl_enc \ - libEGL_emulation \ - libGLESv2_enc \ - libOpenglSystemCommon \ - libGLESv2_emulation \ - libGLESv1_enc \ - rild - - -PRODUCT_COPY_FILES += \ - device/generic/mini-emulator-armv7-a-neon/init.mini-emulator.rc:root/init.goldfish.rc \ - device/generic/goldfish/init.goldfish.sh:system/etc/init.goldfish.sh \ - device/generic/goldfish/ueventd.goldfish.rc:root/ueventd.goldfish.rc \ - device/generic/goldfish/data/etc/apns-conf.xml:system/etc/apns-conf.xml \ - frameworks/native/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:system/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml \ - frameworks/native/data/etc/android.hardware.camera.autofocus.xml:system/etc/permissions/android.hardware.camera.autofocus.xml \ - frameworks/av/media/libeffects/data/audio_effects.conf:system/etc/audio_effects.conf \ - hardware/libhardware_legacy/audio/audio_policy.conf:system/etc/audio_policy.conf \ - 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 \ - device/generic/goldfish/fstab.goldfish:root/fstab.goldfish -- cgit v1.2.3