extract mini-emulator common stuffs to mini_emulator_common.mk

- init.*.rc is also renamed

Change-Id: Iabee63c6c50609e3146716ddb97efb10fb392345

3 files changed, 34 insertions, 19 deletions

diff --git a/init.mini-emulator-armv7-a-neon.rc b/init.mini-emulator.rc
index dd13303..dd13303 100644
--- a/init.mini-emulator-armv7-a-neon.rc
+++ b/init.mini-emulator.rc
diff --git a/mini_emulator_armv7a_neon.mk b/mini_emulator_armv7a_neon.mk
index 2666964..587a6be 100644
--- a/mini_emulator_armv7a_neon.mk
+++ b/mini_emulator_armv7a_neon.mk
@@ -14,6 +14,8 @@
 
 $(call inherit-product, device/generic/armv7-a-neon/mini_armv7a_neon.mk)
 
+$(call inherit-product, device/generic/mini-emulator-armv7-a-neon/mini_emulator_common.mk)
+
 PRODUCT_NAME := mini_emulator_armv7a_neon
 PRODUCT_DEVICE := mini-emulator-armv7-a-neon
 PRODUCT_BRAND := Android
@@ -21,22 +23,3 @@ PRODUCT_MODEL := mini-emulator-armv7-a-neon
 
 # share the same goldfish kernel, but should have fuse support
 LOCAL_KERNEL := prebuilts/qemu-kernel/arm/kernel-qemu-armv7
-
-PRODUCT_PACKAGES += \
-    audio.primary.goldfish
-
-# media_profiles and media_codecs will be moved later!
-PRODUCT_COPY_FILES += \
-    $(LOCAL_KERNEL):kernel \
-    device/generic/mini-emulator-armv7-a-neon/init.mini-emulator-armv7-a-neon.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 \
-    $(call add-to-product-copy-files-if-exists,development/tools/emulator/system/camera/media_profiles.xml:system/etc/media_profiles.xml) \
-    $(call add-to-product-copy-files-if-exists,development/tools/emulator/system/camera/media_codecs.xml:system/etc/media_codecs.xml)
-
-
diff --git a/mini_emulator_common.mk b/mini_emulator_common.mk
new file mode 100644
index 0000000..e141959
--- /dev/null
+++ b/mini_emulator_common.mk
@@ -0,0 +1,32 @@
+# 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.
+
+# common stuffs across mini_emulators
+
+PRODUCT_PACKAGES += \
+    audio.primary.goldfish
+
+# media_profiles and media_codecs will be moved later!
+PRODUCT_COPY_FILES += \
+    $(LOCAL_KERNEL):kernel \
+    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 \
+    $(call add-to-product-copy-files-if-exists,development/tools/emulator/system/camera/media_profiles.xml:system/etc/media_profiles.xml) \
+    $(call add-to-product-copy-files-if-exists,development/tools/emulator/system/camera/media_codecs.xml:system/etc/media_codecs.xml)