Some fixes for cm14

8 files changed, 20 insertions, 15 deletions

diff --git a/Android.mk b/Android.mk
index d46143b..02bf914 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2016 The CyanogenMod Project
+# Copyright (C) 2014 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.
@@ -15,7 +15,7 @@
 
 LOCAL_PATH := $(call my-dir)
 
-ifneq ($(filter msm8952,$(TARGET_BOARD_PLATFORM_VARIANT)),)
+ifneq ($(filter msm8916 msm8939 msm8952,$(TARGET_BOARD_PLATFORM_VARIANT)),)
 
 include $(call all-makefiles-under,$(LOCAL_PATH))
 
diff --git a/board/00-qcom-platform-msm8952.mk b/board/00-qcom-platform-msm8952.mk
index 737b9d7..5799e1e 100644
--- a/board/00-qcom-platform-msm8952.mk
+++ b/board/00-qcom-platform-msm8952.mk
@@ -5,7 +5,6 @@ TARGET_BOARD_PLATFORM := msm8952
 TARGET_BOARD_SUFFIX := _32
 TARGET_ARCH := arm
 TARGET_ARCH_VARIANT := armv7-a-neon
-TARGET_KERNEL_CROSS_COMPILE_PREFIX := arm-linux-androideabi-
 TARGET_CPU_ABI := armeabi-v7a
 TARGET_CPU_ABI2 := armeabi
 TARGET_CPU_VARIANT := cortex-a53
diff --git a/board/ant.mk b/board/ant.mk
index 8de7ba5..f0de964 100644
--- a/board/ant.mk
+++ b/board/ant.mk
@@ -1 +1 @@
-BOARD_ANT_WIRELESS_DEVICE := "vfs-prerelease"
+#BOARD_ANT_WIRELESS_DEVICE := "vfs-prerelease"
diff --git a/board/kernel.mk b/board/kernel.mk
index 96b3fc5..f4f20bd 100644
--- a/board/kernel.mk
+++ b/board/kernel.mk
@@ -11,3 +11,6 @@ ENABLE_CPUSETS := true
 
 TARGET_KERNEL_SOURCE := kernel/google/shamrock
 TARGET_KERNEL_ARCH := arm
+
+KERNEL_TOOLCHAIN := $(ANDROID_BUILD_TOP)/prebuilts/gcc/$(HOST_OS)-x86/arm/arm-eabi-4.9/bin
+TARGET_KERNEL_CROSS_COMPILE_PREFIX := arm-eabi-
\ No newline at end of file
diff --git a/product/ant.mk b/product/ant.mk
index 5f65e99..a6450a6 100644
--- a/product/ant.mk
+++ b/product/ant.mk
@@ -1,8 +1,8 @@
-PRODUCT_PACKAGES += \
-    AntHalService \
-    com.dsi.ant.antradio_library \
-    libantradio
+#PRODUCT_PACKAGES += \
+#    AntHalService \
+#    com.dsi.ant.antradio_library \
+#    libantradio
 
 # Permissions
-PRODUCT_COPY_FILES += \
-    external/ant-wireless/antradio-library/com.dsi.ant.antradio_library.xml:system/etc/permissions/com.dsi.ant.antradio_library.xml
+#PRODUCT_COPY_FILES += \
+#    external/ant-wireless/antradio-library/com.dsi.ant.antradio_library.xml:system/etc/permissions/com.dsi.ant.antradio_library.xml
diff --git a/product/charger.mk b/product/charger.mk
deleted file mode 100644
index ec8724f..0000000
--- a/product/charger.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-# Charger
-PRODUCT_PACKAGES += \
-    charger_res_images
diff --git a/product/qcom-radio.mk b/product/qcom-radio.mk
index ec3af2c..c7775ab 100644
--- a/product/qcom-radio.mk
+++ b/product/qcom-radio.mk
@@ -17,6 +17,12 @@ PRODUCT_PROPERTY_OVERRIDES += \
 
 # RIL
 PRODUCT_PACKAGES += \
-    libcnefeatureconfig \
     librmnetctl \
     libxml2
+
+	
+PRODUCT_PACKAGES += \
+    telephony-ext
+	
+PRODUCT_BOOT_JARS += \
+    telephony-ext
\ No newline at end of file
diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc
index 70c3e0c..4843c75 100644
--- a/rootdir/etc/init.qcom.rc
+++ b/rootdir/etc/init.qcom.rc
@@ -1,4 +1,4 @@
-# Copyright (c) 2009-2012, 2014, 2016, The Linux Foundation. All rights reserved.
+# Copyright (c) 2009-2012, 2014, The Linux Foundation. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met: