am 5075e028: Merge "Drop setting of in_qemu boolean and restorecon /sys/qemu_trace."
* commit '5075e028efee577a4ff0288f56ef5db9023c8944':
Drop setting of in_qemu boolean and restorecon /sys/qemu_trace.
diff --git a/BoardConfig.mk b/BoardConfig.mk
index d83e84f..c50826b 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -12,3 +12,11 @@
BOARD_EGL_CFG := device/generic/goldfish/opengl/system/egl/egl.cfg
+TARGET_USERIMAGES_USE_EXT4 := true
+BOARD_SYSTEMIMAGE_PARTITION_SIZE := 576716800
+BOARD_USERDATAIMAGE_PARTITION_SIZE := 209715200
+BOARD_CACHEIMAGE_PARTITION_SIZE := 69206016
+BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
+BOARD_FLASH_BLOCK_SIZE := 512
+TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true
+
diff --git a/init.mini-emulator.rc b/init.mini-emulator.rc
index ad19e16..56f7d60 100644
--- a/init.mini-emulator.rc
+++ b/init.mini-emulator.rc
@@ -15,9 +15,6 @@
mount debugfs debugfs /sys/kernel/debug
-#on fs
-# setprop ro.crypto.umount_sd false
-
on post-fs-data
mkdir /data/media 0770 media_rw media_rw
# Set indication (checked by vold) that we have finished this action
@@ -29,6 +26,7 @@
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
@@ -68,6 +66,9 @@
# 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
@@ -99,5 +100,5 @@
oneshot
# virtual sdcard daemon running as media_rw (1023)
-service sdcard /system/bin/sdcard /data/media /mnt/shell/emulated 1023 1023
+service sdcard /system/bin/sdcard -u 1023 -g 1023 -l /data/media /mnt/shell/emulated
class late_start
diff --git a/mini_emulator_armv7a_neon.mk b/mini_emulator_armv7a_neon.mk
index 8330261..2db6421 100644
--- a/mini_emulator_armv7a_neon.mk
+++ b/mini_emulator_armv7a_neon.mk
@@ -22,6 +22,6 @@
PRODUCT_MODEL := mini-emulator-armv7-a-neon
-LOCAL_KERNEL := prebuilts/qemu-kernel/arm/3.4/kernel-qemu-armv7
+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
index 3bee201..9a41ba3 100644
--- a/mini_emulator_common.mk
+++ b/mini_emulator_common.mk
@@ -44,4 +44,5 @@
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 \
- device/generic/goldfish/camera/media_codecs.xml:system/etc/media_codecs.xml
+ device/generic/goldfish/camera/media_codecs.xml:system/etc/media_codecs.xml \
+ device/generic/goldfish/fstab.goldfish:root/fstab.goldfish
