diff options
| author | KalimochoAz <calimochoazucarado@gmail.com> | 2012-11-23 06:51:34 +0100 |
|---|---|---|
| committer | KalimochoAz <calimochoazucarado@gmail.com> | 2012-11-23 06:51:34 +0100 |
| commit | 45bc4b754b3a89d39caac8f9b58b14182c67ecf6 (patch) | |
| tree | 5c052d202b6c9ce9219b5c97167319677a9889f4 /device.mk | |
| parent | 8dc38ab89576751c794f2a8a675628f38718f246 (diff) | |
| parent | 214d003a47e7fe2962df667c5d65bce92a21a40e (diff) | |
| download | device_samsung_tuna-45bc4b754b3a89d39caac8f9b58b14182c67ecf6.zip device_samsung_tuna-45bc4b754b3a89d39caac8f9b58b14182c67ecf6.tar.gz device_samsung_tuna-45bc4b754b3a89d39caac8f9b58b14182c67ecf6.tar.bz2 | |
Merge remote-tracking branch 'remotes/google/jb-mr1-release' into HEAD
Conflicts:
audio/audio_hw.c
init.tuna.rc
overlay/frameworks/base/core/res/res/xml/storage_list.xml
recovery/Android.mk
Change-Id: I0b13c6b5e61ea709b0e9aaa1c7b798684b33873a
Diffstat (limited to 'device.mk')
| -rw-r--r-- | device.mk | 18 |
1 files changed, 7 insertions, 11 deletions
@@ -50,8 +50,8 @@ PRODUCT_PACKAGES += \ audio.usb.default PRODUCT_COPY_FILES += \ - device/samsung/tuna/audio/audio_policy.conf:system/etc/audio_policy.conf - + device/samsung/tuna/audio/audio_policy.conf:system/etc/audio_policy.conf \ + device/samsung/tuna/audio_effects.conf:system/vendor/etc/audio_effects.conf PRODUCT_PACKAGES += \ tuna_hdcp_keys @@ -68,10 +68,6 @@ PRODUCT_COPY_FILES += \ device/samsung/tuna/media_codecs.xml:system/etc/media_codecs.xml \ device/samsung/tuna/gps.conf:system/etc/gps.conf -# Bluetooth configuration files -PRODUCT_COPY_FILES += \ - system/bluetooth/data/main.le.conf:system/etc/bluetooth/main.conf - # Wifi ifneq ($(TARGET_PREBUILT_WIFI_MODULE),) PRODUCT_COPY_FILES += \ @@ -138,10 +134,8 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.nfc.xml:system/etc/permissions/android.hardware.nfc.xml \ frameworks/native/data/etc/android.software.sip.voip.xml:system/etc/permissions/android.software.sip.voip.xml \ 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) + frameworks/native/data/etc/android.hardware.usb.host.xml:system/etc/permissions/android.hardware.usb.host.xml \ + frameworks/native/data/etc/android.hardware.audio.low_latency.xml:system/etc/permissions/android.hardware.audio.low_latency.xml # Melfas touchscreen firmware PRODUCT_COPY_FILES += \ @@ -181,6 +175,9 @@ PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PROPERTY_OVERRIDES += \ ro.sf.lcd_density=320 +PRODUCT_PROPERTY_OVERRIDES += \ + ro.hwui.disable_scissor_opt=true + PRODUCT_CHARACTERISTICS := nosdcard PRODUCT_TAGS += dalvik.gc.type-precise @@ -191,7 +188,6 @@ PRODUCT_PACKAGES += \ # Filesystem management tools PRODUCT_PACKAGES += \ - make_ext4fs \ e2fsck \ setup_fs |