diff options
| -rw-r--r-- | BoardConfig.mk | 5 | ||||
| -rw-r--r-- | bluetooth/bdroid_buildcfg.h | 22 | ||||
| -rw-r--r-- | bthid.ko | bin | 91186 -> 0 bytes | |||
| -rw-r--r-- | device.mk | 6 | ||||
| -rwxr-xr-x | init.tuna.rc | 15 | ||||
| -rw-r--r-- | kernel | bin | 4143232 -> 4145400 bytes |
6 files changed, 33 insertions, 15 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk index 6df76b3..b07c668 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -21,6 +21,10 @@ USE_CAMERA_STUB := true # Use the non-open-source parts, if they're present -include vendor/samsung/tuna/BoardConfigVendor.mk +# Default values, if not overridden else where. +TARGET_BOARD_INFO_FILE ?= device/samsung/tuna/board-info.txt +BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR ?= device/samsung/tuna/bluetooth + TARGET_CPU_ABI := armeabi-v7a TARGET_CPU_ABI2 := armeabi TARGET_CPU_SMP := true @@ -36,7 +40,6 @@ BOARD_KERNEL_BASE := 0x80000000 TARGET_NO_RADIOIMAGE := true TARGET_BOARD_PLATFORM := omap4 TARGET_BOOTLOADER_BOARD_NAME := tuna -TARGET_BOARD_INFO_FILE ?= device/samsung/tuna/board-info.txt BOARD_EGL_CFG := device/samsung/tuna/egl.cfg BOARD_CREATE_TUNA_HDCP_KEYS_SYMLINK := true diff --git a/bluetooth/bdroid_buildcfg.h b/bluetooth/bdroid_buildcfg.h new file mode 100644 index 0000000..5c61b6c --- /dev/null +++ b/bluetooth/bdroid_buildcfg.h @@ -0,0 +1,22 @@ +/* + * Copyright (C) 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. + */ + +#ifndef _BDROID_BUILDCFG_H +#define _BDROID_BUILDCFG_H + +#define BTM_DEF_LOCAL_NAME "Galaxy Nexus 2" + +#endif diff --git a/bthid.ko b/bthid.ko Binary files differdeleted file mode 100644 index a2d82a1..0000000 --- a/bthid.ko +++ /dev/null @@ -79,9 +79,6 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ system/bluetooth/data/main.le.conf:system/etc/bluetooth/main.conf -PRODUCT_COPY_FILES += \ - device/samsung/tuna/bthid.ko:system/lib/modules/bthid.ko - # Wifi ifneq ($(TARGET_PREBUILT_WIFI_MODULE),) PRODUCT_COPY_FILES += \ @@ -146,9 +143,6 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.usb.accessory.xml:system/etc/permissions/android.hardware.usb.accessory.xml \ frameworks/native/data/etc/android.hardware.usb.host.xml:system/etc/permissions/android.hardware.usb.host.xml -PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\ -packages/wallpapers/LivePicker/android.software.live_wallpaper.xml:system/etc/permissions/android.software.live_wallpaper.xml) - # Melfas touchscreen firmware PRODUCT_COPY_FILES += \ device/samsung/tuna/mms144_ts_rev31.fw:system/vendor/firmware/mms144_ts_rev31.fw \ diff --git a/init.tuna.rc b/init.tuna.rc index bf91ed4..00a3865 100755 --- a/init.tuna.rc +++ b/init.tuna.rc @@ -1,16 +1,20 @@ import init.tuna.usb.rc on init - mkdir /mnt/secure/sdcard0 0700 root root + mkdir /mnt/shell/sdcard0 0700 shell shell + # External storage path for apps export EXTERNAL_STORAGE /storage/sdcard0 + # External storage path for adb + export ADB_EXTERNAL_STORAGE /mnt/shell/sdcard0/0 + mkdir /storage 0711 root root mkdir /storage/sdcard0 0000 root root symlink /storage/sdcard0 /sdcard symlink /storage/sdcard0 /mnt/sdcard # Save bugreports as owner - export BUGREPORT_WRITE_PATH /mnt/secure/sdcard0/0 + export BUGREPORT_WRITE_PATH /mnt/shell/sdcard0/0 export BUGREPORT_READ_PATH /storage/sdcard0 on post-fs-data @@ -50,11 +54,6 @@ on boot write /sys/bus/usb/devices/usb1/power/autosuspend_delay_ms 0 write /sys/bus/usb/devices/usb2/power/autosuspend_delay_ms 0 -# Start kernel driver (for BTHID) - insmod /system/lib/modules/bthid.ko - chmod 0660 /dev/bthid - chown bluetooth bluetooth /dev/bthid - on fs mkdir /factory 0775 radio radio mount_all /fstab.tuna @@ -167,7 +166,7 @@ service smc_pa_wvdrm /system/bin/smc_pa_ctrl \ oneshot # virtual sdcard daemon running as media_rw (1023) -service sdcard /system/bin/sdcard /data/media /mnt/secure/sdcard0 1023 1023 +service sdcard /system/bin/sdcard /data/media /mnt/shell/sdcard0 1023 1023 class late_start service p2p_supplicant /system/bin/wpa_supplicant \ Binary files differ |