From c7657bc724fe4a2477f70cc378670a59b3da8f6c Mon Sep 17 00:00:00 2001
From: sbrissen <sbrissen@hotmail.com>
Date: Mon, 28 Oct 2013 11:21:11 -0400
Subject: n5100: merge into common repo kona-common

---
 n5100.mk | 54 +++++++-----------------------------------------------
 1 file changed, 7 insertions(+), 47 deletions(-)

(limited to 'n5100.mk')

diff --git a/n5100.mk b/n5100.mk
index fb0db25..933386c 100755
--- a/n5100.mk
+++ b/n5100.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2012 The CyanogenMod Project
+# Copyright (C) 2013 The CyanogenMod Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,52 +18,13 @@ LOCAL_PATH := device/samsung/n5100
 
 DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
 
-PRODUCT_AAPT_CONFIG := normal large tvdpi hdpi
-PRODUCT_AAPT_PREF_CONFIG := tvdpi
-
-TARGET_SCREEN_HEIGHT := 1280
-TARGET_SCREEN_WIDTH := 800
-
 # Init files
 PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/rootdir/init.smdk4x12.rc:root/init.smdk4x12.rc \
-    $(LOCAL_PATH)/rootdir/init.smdk4x12.usb.rc:root/init.smdk4x12.usb.rc \
-    $(LOCAL_PATH)/rootdir/ueventd.smdk4x12.rc:root/ueventd.smdk4x12.rc \
-    $(LOCAL_PATH)/rootdir/ueventd.smdk4x12.rc:recovery/root/ueventd.smdk4x12.rc \
-    $(LOCAL_PATH)/rootdir/lpm.rc:root/lpm.rc \
-    $(LOCAL_PATH)/rootdir/fstab.smdk4x12:root/fstab.smdk4x12
+    $(LOCAL_PATH)/rootdir/init.smdk4x12.rc:root/init.smdk4x12.rc
 
 # Packages
 PRODUCT_PACKAGES += \
-    tiny_hw \
-    libsecril-client \
-    libsecril-client-sap \
-    DeviceSettings \
-    SamsungServiceMode \
-    VoicePlus
-
-PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/configs/gps.xml:system/etc/gps.xml \
-    $(LOCAL_PATH)/configs/nvram_mfg.txt:system/etc/wifi/nvram_mfg.txt \
-    $(LOCAL_PATH)/configs/nvram_mfg.txt_murata:system/etc/wifi/nvram_mfg.txt_murata \
-    $(LOCAL_PATH)/configs/nvram_net.txt:system/etc/wifi/nvram_net.txt \
-    $(LOCAL_PATH)/configs/nvram_net.txt_murata:system/etc/wifi/nvram_net.txt_murata
-
-# Camera
-PRODUCT_PACKAGES += \
-    camera.smdk4x12
-
-# Sensors
-PRODUCT_PACKAGES += \
-    sensors.smdk4x12
-
-# IRDA
-PRODUCT_PACKAGES += \
-    irda.exynos4
-
-# TWRP
-PRODUCT_COPY_FILES += \
-    device/samsung/n5100/twrp.fstab:recovery/root/etc/twrp.fstab
+    libsecril-client-sap
 
 # RIL
 PRODUCT_PROPERTY_OVERRIDES += \
@@ -78,10 +39,9 @@ PRODUCT_COPY_FILES += \
     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/tablet_core_hardware.xml:system/etc/permissions/handheld_core_hardware.xml
-    
-# Set product characteristic to tablet, needed for some ui elements
-PRODUCT_CHARACTERISTICS := tablet
 
-$(call inherit-product, frameworks/native/build/tablet-7in-xhdpi-2048-dalvik-heap.mk)
+# Include common makefile
+$(call inherit-product, device/samsung/kona-common/kona-common.mk)
+
 $(call inherit-product, vendor/samsung/n5100/n5100-vendor.mk)
-$(call inherit-product, device/samsung/smdk4412-common/common.mk)
+
-- 
cgit v1.1