From b1803038401e473d73e83c4df8e122af48a4ae44 Mon Sep 17 00:00:00 2001 From: Nebojsa Cvetkovic Date: Sat, 10 Nov 2012 10:35:41 +0000 Subject: reorganize device tree, use smdk4412-common tree Change-Id: I1a3c68a2e5ec693c99b624b343c5a12b802d8109 --- i9300.mk | 157 ++++++++------------------------------------------------------- 1 file changed, 19 insertions(+), 138 deletions(-) (limited to 'i9300.mk') diff --git a/i9300.mk b/i9300.mk index 07d1df3..c6dc02e 100644 --- a/i9300.mk +++ b/i9300.mk @@ -14,17 +14,14 @@ # limitations under the License. # +# Include common makefile +$(call inherit-product, device/samsung/smdk4412-common/common.mk) + LOCAL_PATH := device/samsung/i9300 +# Overlay DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay -PRODUCT_BUILD_PROP_OVERRIDES += BUILD_UTC_DATE=0 - -$(call inherit-product, $(SRC_TARGET_DIR)/product/languages_full.mk) - -# The gps config appropriate for this device -$(call inherit-product, device/common/gps/gps_us_supl.mk) - # This device is xhdpi. However the platform doesn't # currently contain all of the bitmaps at xhdpi density so # we do this little trick to fall back to the hdpi version @@ -33,70 +30,34 @@ PRODUCT_AAPT_CONFIG := normal hdpi xhdpi PRODUCT_AAPT_PREF_CONFIG := xhdpi # Init files -PRODUCT_COPY_FILES := \ +PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/fstab.smdk4x12:root/fstab.smdk4x12 \ - $(LOCAL_PATH)/init.bt.rc:root/init.bt.rc \ $(LOCAL_PATH)/init.smdk4x12.rc:root/init.smdk4x12.rc \ - $(LOCAL_PATH)/init.smdk4x12.usb.rc:root/init.smdk4x12.usb.rc \ - $(LOCAL_PATH)/lpm.rc:root/lpm.rc \ - $(LOCAL_PATH)/init.trace.rc:root/init.trace.rc \ $(LOCAL_PATH)/ueventd.smdk4x12.rc:root/ueventd.smdk4x12.rc \ $(LOCAL_PATH)/ueventd.smdk4x12.rc:recovery/root/ueventd.smdk4x12.rc -# Camera FW -PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/80cfw:system/etc/init.d/80cfw - # Audio PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/configs/tiny_hw.xml:system/etc/sound/m0 \ - $(LOCAL_PATH)/configs/audio_policy.conf:system/etc/audio_policy.conf - -# Vold and Storage -PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/configs/vold.fstab:system/etc/vold.fstab - -# Bluetooth configuration files -PRODUCT_COPY_FILES += \ - system/bluetooth/data/main.le.conf:system/etc/bluetooth/main.conf - -# Wifi -PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/configs/wpa_supplicant.conf:system/etc/wifi/wpa_supplicant.conf - -PRODUCT_PROPERTY_OVERRIDES += \ - wifi.interface=wlan0 \ - wifi.supplicant_scan_interval=15 + $(LOCAL_PATH)/configs/tiny_hw.xml:system/etc/sound/m0 # Gps PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/configs/gps.conf:system/etc/gps.conf \ $(LOCAL_PATH)/configs/gps.xml:system/etc/gps.xml -# Packages -PRODUCT_PACKAGES := \ - audio.a2dp.default \ - audio.primary.smdk4x12 \ - audio.usb.default \ - camera.exynos4 \ - Camera \ - com.android.future.usb.accessory \ +# Camera FW +PRODUCT_COPY_FILES += \ + $(LOCAL_PATH)/configs/80cfw:system/etc/init.d/80cfw + +# Product specific Packages +PRODUCT_PACKAGES += \ GalaxyS3Settings \ libsecril-client \ libsecril-client-sap \ - libsync \ - macloader \ - SamsungServiceMode \ - tinymix \ - Torch - -# HAL -PRODUCT_PACKAGES += \ - nfc.exynos4 \ - lights.exynos4 + SamsungServiceMode # NFC PRODUCT_PACKAGES += \ + nfc.exynos4 \ libnfc \ libnfc_jni \ Nfc \ @@ -109,9 +70,9 @@ PRODUCT_COPY_FILES += \ # NFCEE access control ifeq ($(TARGET_BUILD_VARIANT),user) - NFCEE_ACCESS_PATH := $(LOCAL_PATH)/nfcee_access.xml + NFCEE_ACCESS_PATH := $(LOCAL_PATH)/configs/nfcee_access.xml else - NFCEE_ACCESS_PATH := $(LOCAL_PATH)/nfcee_access_debug.xml + NFCEE_ACCESS_PATH := $(LOCAL_PATH)/configs/nfcee_access_debug.xml endif PRODUCT_COPY_FILES += \ @@ -120,26 +81,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ com.android.nfc_extras -# MFC API -PRODUCT_PACKAGES += \ - libsecmfcdecapi \ - libsecmfcencapi - -# OMX -PRODUCT_PACKAGES += \ - libstagefrighthw \ - libSEC_OMX_Resourcemanager \ - libSEC_OMX_Core \ - libOMX.SEC.AVC.Decoder \ - libOMX.SEC.M4V.Decoder \ - libOMX.SEC.WMV.Decoder \ - libOMX.SEC.AVC.Encoder \ - libOMX.SEC.M4V.Encoder -# libOMX.SEC.VP8.Decoder - -PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/configs/media_profiles.xml:system/etc/media_profiles.xml \ - $(LOCAL_PATH)/configs/media_codecs.xml:system/etc/media_codecs.xml +$(call inherit-product, vendor/cm/config/nfc_enhanced.mk) # RIL PRODUCT_PROPERTY_OVERRIDES += \ @@ -148,70 +90,9 @@ PRODUCT_PROPERTY_OVERRIDES += \ ro.ril.hsxpa=1 \ ro.ril.gprsclass=10 -# Filesystem management tools -PRODUCT_PACKAGES += \ - static_busybox \ - make_ext4fs \ - setup_fs - -# Live Wallpapers -PRODUCT_PACKAGES += \ - Galaxy4 \ - HoloSpiralWallpaper \ - LiveWallpapers \ - LiveWallpapersPicker \ - MagicSmokeWallpapers \ - NoiseField \ - PhaseBeam \ - VisualizationWallpapers \ - librs_jni - # These are the hardware-specific features PRODUCT_COPY_FILES += \ - frameworks/native/data/etc/android.hardware.audio.low_latency.xml:system/etc/permissions/android.hardware.audio.low_latency.xml \ - frameworks/native/data/etc/android.hardware.camera.autofocus.xml:system/etc/permissions/android.hardware.camera.autofocus.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.camera.xml:system/etc/permissions/android.hardware.camera.xml \ - frameworks/native/data/etc/android.hardware.location.gps.xml:system/etc/permissions/android.hardware.location.gps.xml \ - frameworks/native/data/etc/android.hardware.location.xml:system/etc/permissions/android.hardware.location.xml \ - frameworks/native/data/etc/android.hardware.sensor.accelerometer.xml:system/etc/permissions/android.hardware.sensor.accelerometer.xml \ - frameworks/native/data/etc/android.hardware.sensor.compass.xml:system/etc/permissions/android.hardware.sensor.compass.xml \ - frameworks/native/data/etc/android.hardware.sensor.gyroscope.xml:system/etc/permissions/android.hardware.sensor.gyroscope.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.proximity.xml:system/etc/permissions/android.hardware.sensor.proximity.xml \ - frameworks/native/data/etc/android.hardware.telephony.gsm.xml:system/etc/permissions/android.hardware.telephony.gsm.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.touchscreen.multitouch.xml:system/etc/permissions/android.hardware.touchscreen.multitouch.xml \ - frameworks/native/data/etc/android.hardware.touchscreen.xml:system/etc/permissions/android.hardware.touchscreen.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 \ - frameworks/native/data/etc/android.hardware.wifi.direct.xml:system/etc/permissions/android.hardware.wifi.direct.xml \ - frameworks/native/data/etc/android.hardware.wifi.xml:system/etc/permissions/android.hardware.wifi.xml \ - frameworks/native/data/etc/android.software.sip.voip.xml:system/etc/permissions/android.software.sip.voip.xml \ - frameworks/native/data/etc/android.software.sip.xml:system/etc/permissions/android.software.sip.xml \ - frameworks/native/data/etc/handheld_core_hardware.xml:system/etc/permissions/handheld_core_hardware.xml - -# Feature live wallpaper -PRODUCT_COPY_FILES += \ - packages/wallpapers/LivePicker/android.software.live_wallpaper.xml:system/etc/permissions/android.software.live_wallpaper.xml - -PRODUCT_PROPERTY_OVERRIDES += \ - ro.opengles.version=131072 \ - hwui.render_dirty_regions=false - -PRODUCT_TAGS += dalvik.gc.type-precise - -# Set default USB interface -PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ - persist.sys.usb.config=mtp - -$(call inherit-product, frameworks/native/build/phone-xhdpi-1024-dalvik-heap.mk) - -# Include exynos4 platform specific parts -TARGET_HAL_PATH := hardware/samsung/exynos4/hal -TARGET_OMX_PATH := hardware/samsung/exynos/multimedia/openmax -$(call inherit-product, hardware/samsung/exynos4x12.mk) -$(call inherit-product, vendor/cm/config/nfc_enhanced.mk) + frameworks/native/data/etc/handheld_core_hardware.xml:system/etc/permissions/handheld_core_hardware.xml \ + frameworks/native/data/etc/android.hardware.telephony.gsm.xml:system/etc/permissions/android.hardware.telephony.gsm.xml $(call inherit-product-if-exists, vendor/samsung/i9300/i9300-vendor.mk) -- cgit v1.1