From dc8180c6c7c0b391fe23bfeb72336ec0d08126f7 Mon Sep 17 00:00:00 2001 From: Ziyann Date: Fri, 14 Nov 2014 12:37:28 +0100 Subject: tuna: refactor makefiles Change-Id: I68d8d05f1baa333e94da4e2450d9e961ec68bd0b --- device.mk | 117 ++++++++++++++++++++++++++++++++------------------------------ 1 file changed, 61 insertions(+), 56 deletions(-) (limited to 'device.mk') diff --git a/device.mk b/device.mk index f9b346d..05cd0f8 100644 --- a/device.mk +++ b/device.mk @@ -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 -- cgit v1.1