NFC refactoring

Change-Id: Id239eae364b7e1eddc512acb3516be1c62a726d1
CyanogenMod · Jul 22, 2013 · 20dd0df · 20dd0df
1 parent 41f25f4
commit 20dd0df
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 1 deletion.
diff --git a/exynos4/exynos4x12/Android.mk b/exynos4/exynos4x12/Android.mk
@@ -15,6 +15,6 @@
 #
 
 ifeq ($(TARGET_SOC),exynos4x12)
-exynos4x12_dirs := liblights nfc
+exynos4x12_dirs := liblights
 include $(call all-named-subdir-makefiles,$(exynos4x12_dirs))
 endif
diff --git a/exynos4/exynos4x12/nfc/Android.mk → exynos4/nfc/Android.mk b/exynos4/exynos4x12/nfc/Android.mk → exynos4/nfc/Android.mk
diff --git a/exynos4/exynos4x12/nfc/nfc_hw.c → exynos4/nfc/nfc_hw.c b/exynos4/exynos4x12/nfc/nfc_hw.c → exynos4/nfc/nfc_hw.c
diff --git a/exynos4210.mk b/exynos4210.mk
@@ -19,5 +19,10 @@ include $(TARGET_HAL_PATH)/Android.mk
 include $(SAM_ROOT)/exynos/multimedia/Android.mk
 include $(SAM_ROOT)/exynos4/exynos4210/Android.mk
 
+#NFC
+ifeq ($(BOARD_HAVE_NFC),true)
+include $(SAM_ROOT)/exynos4/nfc/Android.mk
+endif
+
 endif
 endif
diff --git a/exynos4x12.mk b/exynos4x12.mk
@@ -18,6 +18,7 @@ ifeq ($(TARGET_SOC),exynos4x12)
 include $(TARGET_HAL_PATH)/Android.mk
 include $(SAM_ROOT)/exynos/multimedia/Android.mk
 include $(SAM_ROOT)/exynos4/exynos4x12/Android.mk
+include $(SAM_ROOT)/exynos4/nfc/Android.mk
 
 endif
 endif