celox-common: move to 4.3-style fstab in msm8660-common
Change-Id: Ie40f87f6a713b103d0fdeed6dcdf60e3eb617410
diff --git a/celox-common.mk b/celox-common.mk
index f664e30..d2df5b4 100644
--- a/celox-common.mk
+++ b/celox-common.mk
@@ -33,13 +33,8 @@
PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.hardware.sensor.proximity.xml:system/etc/permissions/android.hardware.sensor.proximity.xml
-# Vold
-PRODUCT_COPY_FILES += \
- device/samsung/celox-common/vold.fstab:system/etc/vold.fstab
-
# Ramdisk
PRODUCT_PACKAGES += \
- fstab.qcom \
init.qcom.rc \
init.target.rc \
ueventd.qcom.rc
diff --git a/overlay/frameworks/base/core/res/res/xml/storage_list.xml b/overlay/frameworks/base/core/res/res/xml/storage_list.xml
deleted file mode 100644
index cbda957..0000000
--- a/overlay/frameworks/base/core/res/res/xml/storage_list.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-**
-** Copyright 2011, 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)
-
- A storage should not have both emulated and removable set to true
--->
-
-<StorageList xmlns:android="http://schemas.android.com/apk/res/android">
- <!-- removable is not set in nosdcard product -->
- <storage android:mountPoint="/storage/sdcard0"
- android:storageDescription="@string/storage_internal"
- android:primary="true"
- android:removable="false"
- android:allowMassStorage="false" />
-
- <storage android:mountPoint="/storage/sdcard1"
- android:storageDescription="@string/storage_sd_card"
- android:primary="false"
- android:removable="true"
- android:allowMassStorage="false" />
-
- <storage android:mountPoint="/storage/usbdisk0"
- android:storageDescription="@string/storage_usb"
- android:primary="false"
- android:removable="true" />
-
-</StorageList>
diff --git a/rootdir/Android.mk b/rootdir/Android.mk
index d5431c8..869ccb9 100644
--- a/rootdir/Android.mk
+++ b/rootdir/Android.mk
@@ -1,14 +1,6 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
-include $(CLEAR_VARS)
-LOCAL_MODULE := fstab.qcom
-LOCAL_MODULE_TAGS := optional eng
-LOCAL_MODULE_CLASS := ETC
-LOCAL_SRC_FILES := etc/fstab.qcom
-LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
-include $(BUILD_PREBUILT)
-
#include $(CLEAR_VARS)
#LOCAL_MODULE := initlogo.rle
#LOCAL_MODULE_TAGS := optional eng
diff --git a/rootdir/etc/fstab.qcom b/rootdir/etc/fstab.qcom
deleted file mode 100644
index 36c9afa..0000000
--- a/rootdir/etc/fstab.qcom
+++ /dev/null
@@ -1,9 +0,0 @@
-# Android fstab file.
-#<src> <mnt_point> <type> <mnt_flags and options> <fs_mgr_flags>
-# The filesystem that contains the filesystem checker binary (typically /system) cannot
-# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
-
-/dev/block/mmcblk0p24 /system ext4 ro,barrier=1 wait
-/dev/block/mmcblk0p26 /cache ext4 nosuid,nodev,barrier=1 wait,check
-/dev/block/mmcblk0p21 /efs ext4 nosuid,nodev,barrier=1 wait.check
-/dev/block/mmcblk0p25 /data ext4 noatime,nosuid,nodev,barrier=1,noauto_da_alloc wait,check,encryptable=footer
diff --git a/vold.fstab b/vold.fstab
deleted file mode 100644
index 6dfb0a9..0000000
--- a/vold.fstab
+++ /dev/null
@@ -1,22 +0,0 @@
-## Vold 2.0 Generic fstab
-## - San Mehat (san@android.com)
-##
-
-#######################
-## Regular device mount
-##
-## Format: dev_mount <label> <mount_point> <part> <sysfs_path1...>
-## label - Label for the volume
-## mount_point - Where the volume will be mounted
-## part - Partition # (1 based), or 'auto' for first usable partition.
-## <sysfs_path> - List of sysfs paths to source devices
-## storage_struct - ex) series, "/mnt/sdcard/extStorages" / parallel
-######################
-# internal sdcard
-dev_mount sdcard /storage/sdcard0 28 /devices/platform/msm_sdcc.1/mmc_host/mmc0/mmc0
-
-# external sdcard
-dev_mount external_sd /storage/sdcard1 auto /devices/platform/msm_sdcc.3/mmc_host/mmc2/mmc2
-
-#otg sdcard
-dev_mount sda /storage/usbdisk0 auto /devices/platform/msm_hsusb_host.0