Commit 304f9ce7 authored by Rob Shannon's avatar Rob Shannon

Choo Choo Ril Has Departed Platform 1

parent 0200d7f0
......@@ -37,13 +37,6 @@ CAMERA_USES_SURFACEFLINGER_CLIENT_STUB := true
BOARD_HAVE_HTC_FFC := true
BOARD_CAMERA_HAVE_ISO := true
# Flags
USE_MORE_OPT_FLAGS := yes
#BASE_CFLAGS := -mfpu=neon -mfloat-abi=softfp
#TARGET_GLOBAL_CFLAGS += $(BASE_CFLAGS)
#TARGET_GLOBAL_CPPFLAGS += $(BASE_CFLAGS)
# Board
TARGET_BOARD_PLATFORM := tegra
TARGET_NO_BOOTLOADER := true
......@@ -101,9 +94,9 @@ COMMON_GLOBAL_CFLAGS += -DHTCLOG
# Kernel
TARGET_PROVIDES_INIT_TARGET_RC := true
TARGET_PREBUILT_KERNEL := device/htc/evitareul/prebuilt/kernel
TARGET_KERNEL_SOURCE := kernel/htc/evitareul
TARGET_KERNEL_CONFIG := evitareul_defconfig
#TARGET_PREBUILT_KERNEL := device/htc/evitareul/prebuilt/kernel
#TARGET_KERNEL_SOURCE := kernel/htc/evitareul
#TARGET_KERNEL_CONFIG := evitareul_defconfig
# NFC
BOARD_HAVE_NFC := true
......
......@@ -104,12 +104,6 @@ PRODUCT_PACKAGES += \
sdcard \
libmtp
#Ril Testing
#PRODUCT_PACKAGES += \
libril \
rild
# DSP
PRODUCT_COPY_FILES += \
device/htc/evitareul/dsp/AIC3008_REG_DualMic.csv:system/etc/AIC3008_REG_DualMic.csv \
......@@ -216,14 +210,6 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
$(call inherit-product-if-exists, vendor/htc/encr2b/evitareul-vendor.mk)
$(call inherit-product, frameworks/native/build/phone-xhdpi-1024-dalvik-heap.mk)
# Discard inherited values and use our own instead.
PRODUCT_DEVICE := evitareul
PRODUCT_NAME := eviatreul
PRODUCT_BRAND := htc
PRODUCT_MODEL := One X+
PRODUCT_MANUFACTURER := HTC
# Permissions
PRODUCT_COPY_FILES += \
frameworks/native/data/etc/handheld_core_hardware.xml:system/etc/permissions/handheld_core_hardware.xml \
......@@ -512,4 +498,7 @@ PRODUCT_COPY_FILES += \
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/proprietary/bin/qmuxd:/system/bin/qmuxd \
$(LOCAL_PATH)/proprietary/bin/diag_uart_log:/system/bin/diag_uart_log
$(LOCAL_PATH)/proprietary/bin/diag_uart_log:/system/bin/diag_uart_log \
$(LOCAL_PATH)/proprietary/bin/netmgrd:/system/bin/netmgrd \
$(LOCAL_PATH)/proprietary/bin/dmagent:/system/bin/dmagent
......@@ -3,9 +3,9 @@
# 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/platform/sdhci-tegra.3/by-name/APP /system ext4 rw,barrier=0 wait
/dev/block/platform/sdhci-tegra.3/by-name/UDA /data ext4 noatime,nosuid,nodev,noauto_da_alloc,barrier=0 wait,encryptable=/dev/block/platform/sdhci-tegra.3/by-name/DUM
/dev/block/platform/sdhci-tegra.3/by-name/CAC /cache ext4 noatime,nosuid,nodev,noauto_da_alloc,barrier=0 wait
/dev/block/platform/sdhci-tegra.3/by-name/RCA /rca ext4 noatime,ro,barrier=0 wait
/dev/block/platform/sdhci-tegra.3/by-name/RFS /rfs ext4 noatime,rw,barrier=0 wait
/dev/block/platform/sdhci-tegra.3/by-name/DLG /devlog ext4 nosuid,nodev,barrier=0 defaults
/dev/block/platform/sdhci-tegra.3/by-name/APP /system ext4 ro wait
/dev/block/platform/sdhci-tegra.3/by-name/UDA /data ext4 noatime,nosuid,nodev,noauto_da_alloc wait,encryptable=/dev/block/platform/sdhci-tegra.3/by-name/DUM
/dev/block/platform/sdhci-tegra.3/by-name/CAC /cache ext4 noatime,nosuid,nodev,noauto_da_alloc wait
/dev/block/platform/sdhci-tegra.3/by-name/RCA /rca ext4 noatime,ro wait
/dev/block/platform/sdhci-tegra.3/by-name/RFS /rfs ext4 noatime,rw wait
/dev/block/platform/sdhci-tegra.3/by-name/DLG /devlog ext4 nosuid,nodev defaults
......@@ -34,7 +34,6 @@ on fs
chmod 0660 /rca
chmod 0660 /rfs
setprop ro.crypto.fuse_sdcard true
setprop ro.crypto.umount_sd false
#Sophia
mount vfat /dev/block/platform/sdhci-tegra.3/by-name/MDM /firmware/mdm ro shortname=lower
......@@ -419,13 +418,13 @@ service dx_drm_server /system/bin/DxDrmServerIpc -f -o allow_other /data/DxDrm/f
# Discretix DRM change end
# OMA DRM change start
service fusermount /system/bin/fusermount -u /data/htcfs
disabled
oneshot
#service fusermount /system/bin/fusermount -u /data/htcfs
# disabled
# oneshot
service htcfs /system/bin/htcfs /data/htcfs -f -o allow_other
class main
onrestart restart fusermount
#service htcfs /system/bin/htcfs /data/htcfs -f -o allow_other
# class main
# onrestart restart fusermount
# OMA DRM change end
# init dmagent
......
This diff is collapsed.
# These settings are specific to running under the Android emulator
/dev/qemu_trace 0666 system system
/dev/qemu_pipe 0666 system system
/dev/ttyS* 0666 system system
/proc 0666 system system
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment