diff options
Diffstat (limited to 'device_base.mk')
| -rw-r--r-- | device_base.mk | 45 |
1 files changed, 26 insertions, 19 deletions
diff --git a/device_base.mk b/device_base.mk index 45e6adb..edd2c77 100644 --- a/device_base.mk +++ b/device_base.mk @@ -51,6 +51,7 @@ PRODUCT_COPY_FILES := \ PRODUCT_COPY_FILES += \ device/samsung/crespo/init.herring.rc:root/init.herring.rc \ device/samsung/crespo/init.herring.usb.rc:root/init.herring.usb.rc \ + device/samsung/crespo/fstab.herring:root/fstab.herring \ device/samsung/crespo/ueventd.herring.rc:root/ueventd.herring.rc # Prebuilt kl and kcm keymaps @@ -91,13 +92,13 @@ PRODUCT_COPY_FILES += \ # file that declares the MIFARE NFC constant PRODUCT_COPY_FILES += \ - device/sample/nxp/com.nxp.mifare.xml:system/etc/permissions/com.nxp.mifare.xml + frameworks/native/data/etc/com.nxp.mifare.xml:system/etc/permissions/com.nxp.mifare.xml # NFC EXTRAS add-on API PRODUCT_PACKAGES += \ com.android.nfc_extras PRODUCT_COPY_FILES += \ - frameworks/base/nfc-extras/com.android.nfc_extras.xml:system/etc/permissions/com.android.nfc_extras.xml + frameworks/native/data/etc/com.android.nfc_extras.xml:system/etc/permissions/com.android.nfc_extras.xml # NFCEE access control ifeq ($(TARGET_BUILD_VARIANT),user) @@ -123,7 +124,8 @@ PRODUCT_CHARACTERISTICS := nosdcard # These are the OpenMAX IL configuration files PRODUCT_COPY_FILES += \ device/samsung/crespo/sec_mm/sec_omx/sec_omx_core/secomxregistry:system/etc/secomxregistry \ - device/samsung/crespo/media_profiles.xml:system/etc/media_profiles.xml + device/samsung/crespo/media_profiles.xml:system/etc/media_profiles.xml \ + device/samsung/crespo/media_codecs.xml:system/etc/media_codecs.xml # These are the OpenMAX IL modules @@ -149,7 +151,10 @@ PRODUCT_PACKAGES += \ audio_policy.herring \ audio.primary.herring \ audio.a2dp.default \ - libaudioutils + audio.usb.default + +PRODUCT_COPY_FILES += \ + device/samsung/crespo/libaudio/audio_policy.conf:system/etc/audio_policy.conf # NFC PRODUCT_PACKAGES += \ @@ -177,18 +182,18 @@ PRODUCT_COPY_FILES += \ # These are the hardware-specific features PRODUCT_COPY_FILES += \ - frameworks/base/data/etc/handheld_core_hardware.xml:system/etc/permissions/handheld_core_hardware.xml \ - frameworks/base/data/etc/android.hardware.camera.flash-autofocus.xml:system/etc/permissions/android.hardware.camera.flash-autofocus.xml \ - frameworks/base/data/etc/android.hardware.camera.front.xml:system/etc/permissions/android.hardware.camera.front.xml \ - frameworks/base/data/etc/android.hardware.location.gps.xml:system/etc/permissions/android.hardware.location.gps.xml \ - frameworks/base/data/etc/android.hardware.wifi.xml:system/etc/permissions/android.hardware.wifi.xml \ - frameworks/base/data/etc/android.hardware.sensor.proximity.xml:system/etc/permissions/android.hardware.sensor.proximity.xml \ - frameworks/base/data/etc/android.hardware.sensor.light.xml:system/etc/permissions/android.hardware.sensor.light.xml \ - frameworks/base/data/etc/android.hardware.sensor.gyroscope.xml:system/etc/permissions/android.hardware.sensor.gyroscope.xml \ - frameworks/base/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:system/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml \ - frameworks/base/data/etc/android.hardware.nfc.xml:system/etc/permissions/android.hardware.nfc.xml \ - frameworks/base/data/etc/android.software.sip.voip.xml:system/etc/permissions/android.software.sip.voip.xml \ - frameworks/base/data/etc/android.hardware.usb.accessory.xml:system/etc/permissions/android.hardware.usb.accessory.xml \ + frameworks/native/data/etc/handheld_core_hardware.xml:system/etc/permissions/handheld_core_hardware.xml \ + frameworks/native/data/etc/android.hardware.camera.flash-autofocus.xml:system/etc/permissions/android.hardware.camera.flash-autofocus.xml \ + frameworks/native/data/etc/android.hardware.camera.front.xml:system/etc/permissions/android.hardware.camera.front.xml \ + frameworks/native/data/etc/android.hardware.location.gps.xml:system/etc/permissions/android.hardware.location.gps.xml \ + frameworks/native/data/etc/android.hardware.wifi.xml:system/etc/permissions/android.hardware.wifi.xml \ + frameworks/native/data/etc/android.hardware.sensor.proximity.xml:system/etc/permissions/android.hardware.sensor.proximity.xml \ + frameworks/native/data/etc/android.hardware.sensor.light.xml:system/etc/permissions/android.hardware.sensor.light.xml \ + frameworks/native/data/etc/android.hardware.sensor.gyroscope.xml:system/etc/permissions/android.hardware.sensor.gyroscope.xml \ + frameworks/native/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:system/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml \ + 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 \ packages/wallpapers/LivePicker/android.software.live_wallpaper.xml:system/etc/permissions/android.software.live_wallpaper.xml # The OpenGL ES API level that is natively supported by this device. @@ -200,14 +205,13 @@ PRODUCT_PROPERTY_OVERRIDES := \ # Note that the only such settings should be the ones that are too low-level to # be reachable from resources or other mechanisms. PRODUCT_PROPERTY_OVERRIDES += \ - wifi.interface=wlan0 \ - wifi.supplicant_scan_interval=15 + wifi.interface=wlan0 # Set default USB interface PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ persist.sys.usb.config=mass_storage -include frameworks/base/build/phone-hdpi-512-dalvik-heap.mk +include frameworks/native/build/phone-hdpi-512-dalvik-heap.mk # we have enough storage space to hold precise GC data PRODUCT_TAGS += dalvik.gc.type-precise @@ -216,3 +220,6 @@ PRODUCT_TAGS += dalvik.gc.type-precise PRODUCT_AAPT_CONFIG := normal hdpi $(call inherit-product-if-exists, vendor/nxp/pn544/nxp-pn544-fw-vendor.mk) + +WIFI_BAND := 802_11_BG +$(call inherit-product-if-exists, hardware/broadcom/wlan/bcmdhd/firmware/bcm4329/device-bcm.mk) |