Removed dex preopt option, added back stock kernel.
diff --git a/Android.mk b/Android.mk
index 220c4e7..38b4185 100644
--- a/Android.mk
+++ b/Android.mk
@@ -77,6 +77,10 @@
ln -sf /etc/libnfc-sec.conf \
$(TARGET_OUT)/etc/libnfc-brcm.conf)
+$(shell mkdir -p $(TARGET_OUT)/lib/modules/pronto; \
+ ln -sf /system/lib/modules/pronto/pronto_wlan.ko \
+$(TARGET_OUT)/lib/modules/wlan.ko)
+
#Create link for wifi config
$(shell mkdir -p $(TARGET_OUT)/etc/wifi; \
ln -sf /etc/firmware/wlan/prima/WCNSS_qcom_cfg.ini \
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 4124b75..b0d58d3 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -91,7 +91,7 @@
#TARGET_NO_RPC := true
#ART
-WITH_DEXPREOPT := true
+#WITH_DEXPREOPT := true
# Init
TARGET_INIT_VENDOR_LIB := libinit_msm
@@ -108,12 +108,12 @@
BOARD_KERNEL_SEPARATED_DT := true
BOARD_KERNEL_TAGS_OFFSET := 0x01E00000
BOARD_RAMDISK_OFFSET := 0x02000000
-TARGET_KERNEL_CONFIG := msm8916_sec_defconfig
-TARGET_KERNEL_VARIANT_CONFIG := msm8916_sec_fortuna_can_defconfig
-TARGET_KERNEL_SELINUX_CONFIG := selinux_defconfig
-TARGET_KERNEL_SELINUX_LOG_CONFIG := selinux_log_defconfig
+#TARGET_KERNEL_CONFIG := msm8916_sec_defconfig
+#TARGET_KERNEL_VARIANT_CONFIG := msm8916_sec_fortuna_can_defconfig
+#TARGET_KERNEL_SELINUX_CONFIG := selinux_defconfig
+#TARGET_KERNEL_SELINUX_LOG_CONFIG := selinux_log_defconfig
TARGET_KERNEL_SOURCE := kernel/samsung/gprimeltecan
-#TARGET_PREBUILT_KERNEL := $(LOCAL_PATH)/kernel
+TARGET_PREBUILT_KERNEL := $(LOCAL_PATH)/kernel
# Lights
TARGET_PROVIDES_LIBLIGHT := false
@@ -255,12 +255,12 @@
-include vendor/samsung/gprimeltecan/BoardConfigVendor.mk
#make, move, symlink and strip the wlan kernel module.
-KERNEL_EXTERNAL_MODULES:
- make -C device/samsung/gprimeltecan/wlan/prima/ WLAN_ROOT=$(ANDROID_BUILD_TOP)/device/samsung/gprimeltecan/wlan/prima/ \
- KERNEL_SOURCE=$(KERNEL_OUT) ARCH="arm" CROSS_COMPILE="arm-eabi-"
- mkdir $(KERNEL_MODULES_OUT)/$(WLAN_CHIPSET)/ -p
- ln -sf /system/lib/modules/$(WLAN_CHIPSET)/$(WLAN_CHIPSET)_wlan.ko $(TARGET_OUT)/lib/modules/wlan.ko
- mv device/samsung/gprimeltecan/wlan/prima/wlan.ko $(KERNEL_MODULES_OUT)/$(WLAN_CHIPSET)/$(WLAN_CHIPSET)_wlan.ko
- arm-eabi-strip --strip-debug $(KERNEL_MODULES_OUT)/$(WLAN_CHIPSET)/$(WLAN_CHIPSET)_wlan.ko
+#KERNEL_EXTERNAL_MODULES:
+# make -C device/samsung/gprimeltecan/wlan/prima/ WLAN_ROOT=$(ANDROID_BUILD_TOP)/device/samsung/gprimeltecan/wlan/prima/ \
+# KERNEL_SOURCE=$(KERNEL_OUT) ARCH="arm" CROSS_COMPILE="arm-eabi-"
+# mkdir $(KERNEL_MODULES_OUT)/$(WLAN_CHIPSET)/ -p
+# ln -sf /system/lib/modules/$(WLAN_CHIPSET)/$(WLAN_CHIPSET)_wlan.ko $(TARGET_OUT)/lib/modules/wlan.ko
+# mv device/samsung/gprimeltecan/wlan/prima/wlan.ko $(KERNEL_MODULES_OUT)/$(WLAN_CHIPSET)/$(WLAN_CHIPSET)_wlan.ko
+# arm-eabi-strip --strip-debug $(KERNEL_MODULES_OUT)/$(WLAN_CHIPSET)/$(WLAN_CHIPSET)_wlan.ko
-TARGET_KERNEL_MODULES := KERNEL_EXTERNAL_MODULES
+#TARGET_KERNEL_MODULES := KERNEL_EXTERNAL_MODULES
diff --git a/device.mk b/device.mk
index e631a3f..094889b 100644
--- a/device.mk
+++ b/device.mk
@@ -13,7 +13,14 @@
# Common overlay
DEVICE_PACKAGE_OVERLAYS += device/samsung/gprimeltecan/overlay
+ifeq ($(TARGET_PREBUILT_KERNEL),)
+ LOCAL_KERNEL := device/samsung/gprimeltecan/kernel
+else
+ LOCAL_KERNEL := $(TARGET_PREBUILT_KERNEL)
+endif
+
PRODUCT_COPY_FILES += \
+ $(LOCAL_KERNEL):kernel \
$(LOCAL_PATH)/dt.img:dt.img
#Android EGL implementation