resolved conflicts for merge of 3cac9cb3
to master
Change-Id: I86b5173ad49522eae082bf2a3d096dbfb5240129
This commit is contained in:
commit
f848a429dd
|
@ -18,6 +18,7 @@ loglevel 3
|
|||
export ANDROID_ASSETS /system/app
|
||||
export ANDROID_DATA /data
|
||||
export ASEC_MOUNTPOINT /mnt/asec
|
||||
export LOOP_MOUNTPOINT /mnt/obb
|
||||
export BOOTCLASSPATH /system/framework/core.jar:/system/framework/bouncycastle.jar:/system/framework/ext.jar:/system/framework/framework.jar:/system/framework/android.policy.jar:/system/framework/services.jar:/system/framework/core-junit.jar
|
||||
|
||||
# Backward compatibility
|
||||
|
@ -49,6 +50,10 @@ loglevel 3
|
|||
mkdir /mnt/asec 0700 root system
|
||||
mount tmpfs tmpfs /mnt/asec mode=0755,gid=1000
|
||||
|
||||
# Filesystem image public mount points.
|
||||
mkdir /mnt/obb 0700 root system
|
||||
mount tmpfs tmpfs /mnt/obb mode=0755,gid=1000
|
||||
|
||||
mount rootfs rootfs / ro remount
|
||||
|
||||
write /proc/sys/kernel/panic_on_oops 1
|
||||
|
|
Loading…
Reference in New Issue