From 20dd0df8e39a60032adc6baaa3d21fadbc25516c Mon Sep 17 00:00:00 2001 From: Qaweck Date: Mon, 22 Jul 2013 20:31:23 +0200 Subject: [PATCH] NFC refactoring Change-Id: Id239eae364b7e1eddc512acb3516be1c62a726d1 --- exynos4/exynos4x12/Android.mk | 2 +- exynos4/{exynos4x12 => }/nfc/Android.mk | 0 exynos4/{exynos4x12 => }/nfc/nfc_hw.c | 0 exynos4210.mk | 5 +++++ exynos4x12.mk | 1 + 5 files changed, 7 insertions(+), 1 deletion(-) rename exynos4/{exynos4x12 => }/nfc/Android.mk (100%) rename exynos4/{exynos4x12 => }/nfc/nfc_hw.c (100%) diff --git a/exynos4/exynos4x12/Android.mk b/exynos4/exynos4x12/Android.mk index 3d96ffaf..5d6039f0 100644 --- 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 b/exynos4/nfc/Android.mk similarity index 100% rename from exynos4/exynos4x12/nfc/Android.mk rename to exynos4/nfc/Android.mk diff --git a/exynos4/exynos4x12/nfc/nfc_hw.c b/exynos4/nfc/nfc_hw.c similarity index 100% rename from exynos4/exynos4x12/nfc/nfc_hw.c rename to exynos4/nfc/nfc_hw.c diff --git a/exynos4210.mk b/exynos4210.mk index 218ad626..231456af 100644 --- 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 index 1ed3e125..02027ccd 100644 --- 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