diff options
author | Jean-Baptiste Queru <jbq@google.com> | 2012-10-05 10:26:56 -0700 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2012-10-05 10:26:56 -0700 |
commit | 0734a8bd4eef9dfcce76e0c667a8244b2566ba4c (patch) | |
tree | 5a1ea5fb20a7485acee6026c220a4f1a1559b612 | |
parent | 45c6a6d7a98842ae92aba43d8eb0a4278396b90a (diff) | |
parent | 796549f774d41384850b3f05697ecf5d98464a13 (diff) | |
download | lt26-0734a8bd4eef9dfcce76e0c667a8244b2566ba4c.tar.gz |
Merge "Fixing sdcard configuration"
-rw-r--r-- | config/init.semc.rc | 13 | ||||
-rw-r--r-- | config/vold.fstab | 2 | ||||
-rw-r--r-- | device.mk | 2 | ||||
-rw-r--r-- | overlay/frameworks/base/core/res/res/xml/storage_list.xml | 46 |
4 files changed, 53 insertions, 10 deletions
diff --git a/config/init.semc.rc b/config/init.semc.rc index dc740e5..4e3edf8 100644 --- a/config/init.semc.rc +++ b/config/init.semc.rc @@ -4,7 +4,6 @@ on early-init export EXTERNAL_STORAGE /storage/sdcard0 mkdir /storage 0050 system sdcard_r mkdir /storage/sdcard0 0000 system system - mkdir /storage/sdcard1 0000 system system # for backwards compatibility symlink /storage/sdcard0 /sdcard symlink /storage/sdcard0 /mnt/sdcard @@ -223,21 +222,17 @@ on init write /sys/class/android_usb/android0/f_rndis/vendorID 0fce write /sys/class/android_usb/android0/f_rndis/wceis 1 - # setup the global environment - export EXTERNAL_STORAGE_USB /mnt/usbdisk - # create mountpoint - mkdir /mnt/usbdisk 0000 system system + mkdir /storage/usbdisk 0000 system system # Create symlink - symlink /mnt/usbdisk /usbdisk + symlink /storage/usbdisk /usbdisk + symlink /storage/usbdisk /mnt/usbdisk # setup the global environment - export SECONDARY_STORAGE /mnt/usbdisk + export SECONDARY_STORAGE /storage/usbdisk on post-fs-data - mkdir /data/media 0770 media_rw media_rw - chown media_rw media_rw /data/media mkdir /data/misc/wifi 0770 wifi wifi mkdir /data/misc/wifi/sockets 0770 wifi wifi mkdir /data/misc/dhcp 0770 dhcp dhcp diff --git a/config/vold.fstab b/config/vold.fstab index 76c9c83..3354544 100644 --- a/config/vold.fstab +++ b/config/vold.fstab @@ -1,2 +1,2 @@ dev_mount sdcard /storage/sdcard0 15 /devices/platform/msm_sdcc.1/mmc_host/mmc0 -dev_mount usbdisk /mnt/usbdisk auto /devices/platform/msm_hsusb_host.0 +dev_mount usbdisk /storage/usbdisk auto /devices/platform/msm_hsusb_host.0 @@ -26,6 +26,8 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES := \ lights.lt26 +PRODUCT_CHARACTERISTICS := nosdcard + DEVICE_PACKAGE_OVERLAYS += device/sony/lt26/overlay # The gps config appropriate for this device diff --git a/overlay/frameworks/base/core/res/res/xml/storage_list.xml b/overlay/frameworks/base/core/res/res/xml/storage_list.xml new file mode 100644 index 0000000..d28de8f --- /dev/null +++ b/overlay/frameworks/base/core/res/res/xml/storage_list.xml @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +** +** Copyright 2012, 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. +*/ +--> + +<!-- The <device> element should contain one or more <storage> elements. + Exactly one of these should have the attribute primary="true". + This storage will be the primary external storage and should have path="/mnt/sdcard". + Each storage should have both a path and description attribute set. + The following boolean attributes are optional: + + primary: this storage is the primary external storage + removable: this is removable storage (for example, a real SD card) + emulated: the storage is emulated via the FUSE sdcard daemon + mtp-reserve: number of megabytes of storage MTP should reserve for free storage + (used for emulated storage that is shared with system's data partition) + allowMassStorage: (boolean) true if this volume can be shared via USB mass storage + maxFileSize: (integer) maximum file size in megabytes + + A storage should not have both emulated and removable set to true +--> +<StorageList xmlns:android="http://schemas.android.com/apk/res/android"> + <storage android:mountPoint="/storage/sdcard0" + android:storageDescription="@string/storage_internal" + android:primary="true" + android:emulated="false" + android:removable="false" + android:allowMassStorage="false"/> + <storage android:mountPoint="/storage/usbdisk" + android:storageDescription="@string/storage_usb" + android:removable="true"/> +</StorageList> |