aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xBoardConfig.mk5
-rwxr-xr-xn5100.mk3
2 files changed, 1 insertions, 7 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 3dc51a4..caff696 100755
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -14,8 +14,6 @@
# limitations under the License.
#
-# This variable is set first, so it can be overridden
-# by BoardConfigVendor.mk
-include device/samsung/kona-common/BoardConfigCommon.mk
LOCAL_PATH := device/samsung/n5100
@@ -38,8 +36,5 @@ RECOVERY_FSTAB_VERSION := 2
BOARD_RECOVERY_SWIPE := true
BOARD_RECOVERY_SWIPE_SWAPXY := true
-# inherit from the proprietary version
--include vendor/samsung/n5100/BoardConfigVendor.mk
-
# assert
TARGET_OTA_ASSERT_DEVICE := GT-N5100,kona3g,n5100,kona3gxx
diff --git a/n5100.mk b/n5100.mk
index 65784b2..6271d47 100755
--- a/n5100.mk
+++ b/n5100.mk
@@ -45,6 +45,5 @@ PRODUCT_COPY_FILES += \
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
-# 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/kona-common/kona-common.mk)