7 files changed, 19 insertions, 70 deletions
diff --git a/kona-common.mk b/kona-common.mk
index bf91f03..6df3bec 100644
--- a/kona-common.mk
+++ b/kona-common.mk
@@ -23,8 +23,8 @@ DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
 PRODUCT_AAPT_CONFIG := hdpi
 PRODUCT_AAPT_PREF_CONFIG := xhdpi
 
-TARGET_SCREEN_HEIGHT := 800
-TARGET_SCREEN_WIDTH := 1280
+# Boot animation
+TARGET_BOOTANIMATION_NAME := vertical-800x1280
 
 TARGET_HAS_CAM_FLASH := false
 
@@ -35,6 +35,15 @@ PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/rootdir/ueventd.smdk4x12.rc:recovery/root/ueventd.smdk4x12.rc \
     $(LOCAL_PATH)/rootdir/ueventd.smdk4x12.rc:root/ueventd.smdk4x12.rc
 
+# Idc
+PRODUCT_COPY_FILES += \
+    $(LOCAL_PATH)/usr/idc/sec_e-pen.idc:/system/usr/idc/sec_e-pen.idc
+
+# Keylayout
+PRODUCT_COPY_FILES += \
+    $(LOCAL_PATH)/usr/keylayout/sec_e-pen.kl:/system/usr/keylayout/sec_e-pen.kl \
+    $(LOCAL_PATH)/usr/keylayout/sec_touchscreen.kl:/system/usr/keylayout/sec_touchscreen.kl
+
 # Stock MM blobs
 PRODUCT_PACKAGES += \
     libxml2 \
@@ -42,7 +51,6 @@ PRODUCT_PACKAGES += \
 
 # Packages
 PRODUCT_PACKAGES += \
-    libsamsung_symbols \
     tiny_hw \
     tinyplay \
     SamsungServiceMode \
@@ -56,11 +64,6 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
     camera.smdk4x12
 
-# RIL
-PRODUCT_PACKAGES += \
-    libsecril-client \
-    libsecril-client-sap
-
 # Stock parameters
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.sf.hwrotation=270 \
@@ -82,5 +85,5 @@ PRODUCT_PROPERTY_OVERRIDES += \
     ro.cm.hardware.cabc=/sys/class/mdnie/mdnie/cabc
 
 $(call inherit-product, frameworks/native/build/tablet-10in-xhdpi-2048-dalvik-heap.mk)
-$(call inherit-product, vendor/samsung/kona-common/kona-vendor.mk)
+$(call inherit-product-if-exists, vendor/samsung/kona-common/kona-vendor.mk)
 $(call inherit-product, device/samsung/smdk4412-common/common.mk)
diff --git a/rootdir/init.target.rc b/rootdir/init.target.rc
index 01fdb4c..f7fbb8f 100644
--- a/rootdir/init.target.rc
+++ b/rootdir/init.target.rc
@@ -2,9 +2,6 @@
 on init
 ############################
 
-# Missing symbols
-    export LD_SHIM_LIBS /system/lib/libsec-ril.so|libsamsung_symbols.so
-
 # Vibetonz
     export VIBE_PIPE_PATH /dev/pipes
     mkdir /dev/pipes 0771 system system
@@ -334,12 +331,6 @@ on property:sys.boot_completed=1
 # Services
 ############################
 
-service cpboot-daemon /system/bin/cbd -d -t xmm6262 -p 7
-    class main
-    user root
-    group radio cache inet misc audio sdcard_rw log sdcard_r
-    seclabel u:r:cpboot-daemon:s0
-
 service geomagneticd /system/bin/geomagneticd
     class main
     user compass
diff --git a/samsung_symbols/Android.mk b/samsung_symbols/Android.mk
deleted file mode 100644
index bd57ebb..0000000
--- a/samsung_symbols/Android.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Copyright (C) 2016 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.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := symbols.cpp
-
-LOCAL_SHARED_LIBRARIES := libbinder libgui
-
-LOCAL_MODULE := libsamsung_symbols
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/samsung_symbols/symbols.cpp b/samsung_symbols/symbols.cpp
deleted file mode 100644
index 048883d..0000000
--- a/samsung_symbols/symbols.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2016 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.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <stdlib.h>
-
-// Do not check libsec-ril.so protobuf version
-
-// google::protobuf::internal::VerifyVersion(int, int, char const*)
-extern "C" void _ZN6google8protobuf8internal13VerifyVersionEiiPKc();
-extern "C" void _ZN6google8protobuf8internal13VerifyVersionEiiPKc(){}
-
diff --git a/usr/idc/sec_e-pen.idc b/usr/idc/sec_e-pen.idc
new file mode 100644
index 0000000..0e7fb4f
--- /dev/null
+++ b/usr/idc/sec_e-pen.idc
@@ -0,0 +1,2 @@
+touch.deviceType = pointer
+touch.orientationAware = 1
diff --git a/usr/keylayout/sec_e-pen.kl b/usr/keylayout/sec_e-pen.kl
new file mode 100644
index 0000000..079654f
--- /dev/null
+++ b/usr/keylayout/sec_e-pen.kl
@@ -0,0 +1,3 @@
+key 560		PDCT
+key 158		BACK	WAKE_DROPPED
+key 139		MENU	WAKE_DROPPED
diff --git a/usr/keylayout/sec_touchscreen.kl b/usr/keylayout/sec_touchscreen.kl
new file mode 100644
index 0000000..0b8ff71
--- /dev/null
+++ b/usr/keylayout/sec_touchscreen.kl
@@ -0,0 +1,2 @@
+key 158		BACK	VIRTUAL
+key 139		MENU	VIRTUAL