diff options
| -rw-r--r-- | BoardConfig.mk | 75 | ||||
| -rw-r--r-- | device.mk | 117 | ||||
| -rw-r--r-- | overlay/frameworks/base/core/res/res/values/config.xml | 4 |
3 files changed, 101 insertions, 95 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk index ba7328a..aeb0d31 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -14,6 +14,8 @@ # limitations under the License. # +DEVICE_FOLDER := device/samsung/tuna + # This variable is set first, so it can be overridden # by BoardConfigVendor.mk USE_CAMERA_STUB := true @@ -21,18 +23,20 @@ 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_NO_BOOTLOADER := true +TARGET_NO_RADIOIMAGE := true +TARGET_BOARD_PLATFORM := omap4 +TARGET_BOARD_INFO_FILE := $(DEVICE_FOLDER)/board-info.txt +TARGET_BOOTLOADER_BOARD_NAME := tuna + +# Processor TARGET_CPU_ABI := armeabi-v7a TARGET_CPU_ABI2 := armeabi TARGET_CPU_SMP := true +TARGET_CPU_VARIANT := cortex-a9 TARGET_ARCH := arm TARGET_ARCH_VARIANT := armv7-a-neon -TARGET_CPU_VARIANT := cortex-a9 - -TARGET_NO_BOOTLOADER := true # Kernel BOARD_KERNEL_BASE := 0x80000000 @@ -40,34 +44,23 @@ BOARD_KERNEL_BASE := 0x80000000 TARGET_KERNEL_CONFIG := tuna_defconfig TARGET_KERNEL_SOURCE := kernel/samsung/tuna -TARGET_NO_RADIOIMAGE := true -TARGET_BOARD_PLATFORM := omap4 -TARGET_BOOTLOADER_BOARD_NAME := tuna - -BOARD_EGL_CFG := device/samsung/tuna/egl.cfg +# EGL +BOARD_EGL_CFG := $(DEVICE_FOLDER)/egl.cfg +USE_OPENGL_RENDERER := true BOARD_USE_TI_DUCATI_H264_PROFILE := true +# Include HDCP keys BOARD_CREATE_TUNA_HDCP_KEYS_SYMLINK := true -#BOARD_USES_HGL := true -#BOARD_USES_OVERLAY := true -USE_OPENGL_RENDERER := true - # set if the target supports FBIO_WAITFORVSYNC TARGET_HAS_WAITFORVSYNC := true -# use the new recovery.fstab format -RECOVERY_FSTAB_VERSION=2 - -TARGET_RECOVERY_PIXEL_FORMAT := "BGRA_8888" -TARGET_RECOVERY_UI_LIB := librecovery_ui_tuna - # device-specific extensions to the updater binary TARGET_RECOVERY_UPDATER_LIBS += librecovery_updater_tuna -TARGET_RELEASETOOLS_EXTENSIONS := device/samsung/tuna +TARGET_RELEASETOOLS_EXTENSIONS := $(DEVICE_FOLDER) -TARGET_RECOVERY_FSTAB = device/samsung/tuna/rootdir/fstab.tuna +# Filesystem TARGET_USERIMAGES_USE_EXT4 := true BOARD_SYSTEMIMAGE_PARTITION_SIZE := 685768704 BOARD_USERDATAIMAGE_PARTITION_SIZE := 14539537408 @@ -79,28 +72,40 @@ TARGET_RUNNING_WITHOUT_SYNC_FRAMEWORK := true #TARGET_PROVIDES_INIT_RC := true #TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true -# Wifi related defines -BOARD_WPA_SUPPLICANT_DRIVER := NL80211 -WPA_SUPPLICANT_VERSION := VER_0_8_X +# Wifi +BOARD_WLAN_DEVICE := bcmdhd +BOARD_WLAN_DEVICE_REV := bcm4330_b2 +WPA_SUPPLICANT_VERSION := VER_0_8_X +BOARD_WPA_SUPPLICANT_DRIVER := NL80211 BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_bcmdhd -BOARD_HOSTAPD_DRIVER := NL80211 -BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_bcmdhd -BOARD_WLAN_DEVICE := bcmdhd -WIFI_DRIVER_FW_PATH_PARAM := "/sys/module/bcmdhd/parameters/firmware_path" -#WIFI_DRIVER_MODULE_PATH := "/system/lib/modules/bcmdhd.ko" -WIFI_DRIVER_FW_PATH_STA := "/vendor/firmware/fw_bcmdhd.bin" -WIFI_DRIVER_FW_PATH_AP := "/vendor/firmware/fw_bcmdhd_apsta.bin" - +BOARD_HOSTAPD_DRIVER := NL80211 +BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_bcmdhd +WIFI_DRIVER_FW_PATH_PARAM := "/sys/module/bcmdhd/parameters/firmware_path" +#WIFI_DRIVER_MODULE_PATH := "/system/lib/modules/bcmdhd.ko" +WIFI_DRIVER_FW_PATH_STA := "/vendor/firmware/fw_bcmdhd.bin" +WIFI_DRIVER_FW_PATH_AP := "/vendor/firmware/fw_bcmdhd_apsta.bin" +WIFI_BAND := 802_11_ABG + +# Bluetooth BOARD_HAVE_BLUETOOTH := true BOARD_HAVE_BLUETOOTH_BCM := true +BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := $(DEVICE_FOLDER)/bluetooth BOARD_LIB_DUMPSTATE := libdumpstate.tuna +# Security BOARD_USES_SECURE_SERVICES := true +# SELinux BOARD_SEPOLICY_DIRS := \ - device/samsung/tuna/sepolicy + $(DEVICE_FOLDER)/sepolicy BOARD_SEPOLICY_UNION := \ genfs_contexts \ file_contexts + +# Recovery +RECOVERY_FSTAB_VERSION := 2 +TARGET_RECOVERY_FSTAB = $(DEVICE_FOLDER)/rootdir/fstab.tuna +TARGET_RECOVERY_PIXEL_FORMAT := "BGRA_8888" +TARGET_RECOVERY_UI_LIB := librecovery_ui_tuna @@ -19,7 +19,9 @@ # # Everything in this directory will become public -DEVICE_PACKAGE_OVERLAYS := device/samsung/tuna/overlay +DEVICE_FOLDER := device/samsung/tuna + +DEVICE_PACKAGE_OVERLAYS := $(DEVICE_FOLDER)/overlay # This device is xhdpi. However the platform doesn't # currently contain all of the bitmaps at xhdpi density so @@ -28,46 +30,61 @@ DEVICE_PACKAGE_OVERLAYS := device/samsung/tuna/overlay PRODUCT_AAPT_CONFIG := normal hdpi xhdpi PRODUCT_AAPT_PREF_CONFIG := xhdpi -PRODUCT_PACKAGES := \ +# HALs +PRODUCT_PACKAGES += \ lights.tuna \ - charger \ - charger_res_images + nfc.tuna \ + power.tuna \ + audio.primary.tuna +# Sensors PRODUCT_PACKAGES += \ sensors.tuna \ libinvensense_mpl +# Charging mode PRODUCT_PACKAGES += \ - nfc.tuna - -PRODUCT_PACKAGES += \ - power.tuna + charger \ + charger_res_images # Audio PRODUCT_PACKAGES += \ - audio.primary.tuna \ audio.a2dp.default \ audio.usb.default \ audio.r_submix.default PRODUCT_COPY_FILES += \ - device/samsung/tuna/audio/audio_policy.conf:system/etc/audio_policy.conf \ - device/samsung/tuna/audio/audio_effects.conf:system/vendor/etc/audio_effects.conf + $(DEVICE_FOLDER)/audio/audio_policy.conf:system/etc/audio_policy.conf \ + $(DEVICE_FOLDER)/audio/audio_effects.conf:system/vendor/etc/audio_effects.conf PRODUCT_PACKAGES += \ tuna_hdcp_keys +# Enable AAC 5.1 output +PRODUCT_PROPERTY_OVERRIDES += \ + media.aac_51_output_enabled=true + #PRODUCT_PACKAGES += \ # keystore.tuna +# Init files +PRODUCT_COPY_FILES += \ + $(DEVICE_FOLDER)/rootdir/init.tuna.rc:root/init.tuna.rc \ + $(DEVICE_FOLDER)/rootdir/init.tuna.usb.rc:root/init.tuna.usb.rc \ + $(DEVICE_FOLDER)/rootdir/ueventd.tuna.rc:root/ueventd.tuna.rc + +# Fstab PRODUCT_COPY_FILES += \ - device/samsung/tuna/rootdir/init.tuna.rc:root/init.tuna.rc \ - device/samsung/tuna/rootdir/init.tuna.usb.rc:root/init.tuna.usb.rc \ - device/samsung/tuna/rootdir/fstab.tuna:root/fstab.tuna \ - device/samsung/tuna/rootdir/ueventd.tuna.rc:root/ueventd.tuna.rc \ - device/samsung/tuna/media_profiles.xml:system/etc/media_profiles.xml \ - device/samsung/tuna/media_codecs.xml:system/etc/media_codecs.xml \ - device/samsung/tuna/gps.conf:system/etc/gps.conf + $(DEVICE_FOLDER)/rootdir/fstab.tuna:root/fstab.tuna + +# GPS +PRODUCT_COPY_FILES += \ + $(DEVICE_FOLDER)/gps.conf:system/etc/gps.conf + +# Media profiles +PRODUCT_COPY_FILES += \ + $(DEVICE_FOLDER)/media_profiles.xml:system/etc/media_profiles.xml \ + $(DEVICE_FOLDER)/media_codecs.xml:system/etc/media_codecs.xml # Wifi ifneq ($(TARGET_PREBUILT_WIFI_MODULE),) @@ -75,43 +92,39 @@ PRODUCT_COPY_FILES += \ $(TARGET_PREBUILT_WIFI_MODULE):system/lib/modules/bcmdhd.ko endif PRODUCT_COPY_FILES += \ - device/samsung/tuna/bcmdhd.cal:system/etc/wifi/bcmdhd.cal + $(DEVICE_FOLDER)/bcmdhd.cal:system/etc/wifi/bcmdhd.cal PRODUCT_PROPERTY_OVERRIDES := \ wifi.interface=wlan0 -# Enable AAC 5.1 output -PRODUCT_PROPERTY_OVERRIDES += \ - media.aac_51_output_enabled=true - # Set default USB interface PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ persist.sys.usb.config=mtp # NFC PRODUCT_PACKAGES += \ - Nfc \ - Tag + Nfc \ + Tag # Live Wallpapers PRODUCT_PACKAGES += \ - LiveWallpapers \ - LiveWallpapersPicker \ - VisualizationWallpapers \ - librs_jni + LiveWallpapers \ + LiveWallpapersPicker \ + VisualizationWallpapers \ + librs_jni # Key maps PRODUCT_COPY_FILES += \ - device/samsung/tuna/keymap/tuna-gpio-keypad.kl:system/usr/keylayout/tuna-gpio-keypad.kl \ - device/samsung/tuna/keymap/tuna-gpio-keypad.kcm:system/usr/keychars/tuna-gpio-keypad.kcm \ - device/samsung/tuna/keymap/sec_jack.kl:system/usr/keylayout/sec_jack.kl \ - device/samsung/tuna/keymap/sec_jack.kcm:system/usr/keychars/sec_jack.kcm \ - device/samsung/tuna/keymap/sii9234_rcp.kl:system/usr/keylayout/sii9234_rcp.kl \ - device/samsung/tuna/keymap/sii9234_rcp.kcm:system/usr/keychars/sii9234_rcp.kcm + $(DEVICE_FOLDER)/keymap/tuna-gpio-keypad.kl:system/usr/keylayout/tuna-gpio-keypad.kl \ + $(DEVICE_FOLDER)/keymap/tuna-gpio-keypad.kcm:system/usr/keychars/tuna-gpio-keypad.kcm \ + $(DEVICE_FOLDER)/keymap/sec_jack.kl:system/usr/keylayout/sec_jack.kl \ + $(DEVICE_FOLDER)/keymap/sec_jack.kcm:system/usr/keychars/sec_jack.kcm \ + $(DEVICE_FOLDER)/keymap/sii9234_rcp.kl:system/usr/keylayout/sii9234_rcp.kl \ + $(DEVICE_FOLDER)/keymap/sii9234_rcp.kcm:system/usr/keychars/sii9234_rcp.kcm # Input device calibration files PRODUCT_COPY_FILES += \ - device/samsung/tuna/touchscreen/Melfas_MMSxxx_Touchscreen.idc:system/usr/idc/Melfas_MMSxxx_Touchscreen.idc + $(DEVICE_FOLDER)/touchscreen/Melfas_MMSxxx_Touchscreen.idc:system/usr/idc/Melfas_MMSxxx_Touchscreen.idc # These are the hardware-specific features PRODUCT_COPY_FILES += \ @@ -135,12 +148,12 @@ PRODUCT_COPY_FILES += \ # Melfas touchscreen firmware PRODUCT_COPY_FILES += \ - device/samsung/tuna/touchscreen/mms144_ts_rev31.fw:system/vendor/firmware/mms144_ts_rev31.fw \ - device/samsung/tuna/touchscreen/mms144_ts_rev32.fw:system/vendor/firmware/mms144_ts_rev32.fw + $(DEVICE_FOLDER)/touchscreen/mms144_ts_rev31.fw:system/vendor/firmware/mms144_ts_rev31.fw \ + $(DEVICE_FOLDER)/touchscreen/mms144_ts_rev32.fw:system/vendor/firmware/mms144_ts_rev32.fw # Commands to migrate prefs from com.android.nfc3 to com.android.nfc PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\ -packages/apps/Nfc/migrate_nfc.txt:system/etc/updatecmds/migrate_nfc.txt) + packages/apps/Nfc/migrate_nfc.txt:system/etc/updatecmds/migrate_nfc.txt) # file that declares the MIFARE NFC constant PRODUCT_COPY_FILES += \ @@ -154,28 +167,24 @@ PRODUCT_COPY_FILES += \ # NFCEE access control ifeq ($(TARGET_BUILD_VARIANT),user) - NFCEE_ACCESS_PATH := device/samsung/tuna/nfc/nfcee_access.xml + NFCEE_ACCESS_PATH := $(DEVICE_FOLDER)/nfc/nfcee_access.xml else - NFCEE_ACCESS_PATH := device/samsung/tuna/nfc/nfcee_access_debug.xml + NFCEE_ACCESS_PATH := $(DEVICE_FOLDER)/nfc/nfcee_access_debug.xml endif PRODUCT_COPY_FILES += \ - $(NFCEE_ACCESS_PATH):system/etc/nfcee_access.xml - -PRODUCT_PROPERTY_OVERRIDES += \ - ro.opengles.version=131072 - -PRODUCT_PROPERTY_OVERRIDES += \ - ro.sf.lcd_density=320 + $(NFCEE_ACCESS_PATH):system/etc/nfcee_access.xml PRODUCT_PROPERTY_OVERRIDES += \ + ro.opengles.version=131072 \ + ro.sf.lcd_density=320 \ ro.hwui.disable_scissor_opt=true PRODUCT_CHARACTERISTICS := nosdcard -PRODUCT_TAGS += dalvik.gc.type-precise +PRODUCT_TAGS += \ + dalvik.gc.type-precise PRODUCT_PACKAGES += \ - librs_jni \ com.android.future.usb.accessory # Filesystem management tools @@ -185,11 +194,7 @@ PRODUCT_PACKAGES += \ $(call inherit-product, frameworks/native/build/phone-xhdpi-1024-dalvik-heap.mk) -$(call inherit-product-if-exists, vendor/nxp/pn544/nxp-pn544-fw-vendor.mk) $(call inherit-product, hardware/ti/omap4xxx/omap4.mk) -$(call inherit-product-if-exists, vendor/ti/proprietary/omap4/ti-omap4-vendor.mk) -$(call inherit-product-if-exists, vendor/samsung/tuna/device-vendor.mk) - -BOARD_WLAN_DEVICE_REV := bcm4330_b2 -WIFI_BAND := 802_11_ABG $(call inherit-product-if-exists, hardware/broadcom/wlan/bcmdhd/firmware/bcm4330/device-bcm.mk) + +$(call inherit-product-if-exists, vendor/samsung/tuna/device-vendor.mk)
\ No newline at end of file diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index 54e2ce1..51b55d6 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -237,10 +237,6 @@ <!-- Is the notification LED intrusive? Used to decide if there should be a disable option --> <bool name="config_intrusiveNotificationLed">true</bool> - <!-- Component name of the default wallpaper. This will be ImageWallpaper if not - specified --> - <string name="default_wallpaper_component" translatable="false">com.android.phasebeam/.PhaseBeamWallpaper</string> - <!-- Vibrator pattern for feedback about touching a virtual key --> <integer-array name="config_virtualKeyVibePattern"> <item>10</item> |