diff options
| author | Qaweck <qaweck@gmail.com> | 2013-07-22 20:31:23 +0200 |
|---|---|---|
| committer | Qaweck <qaweck@gmail.com> | 2013-07-22 20:31:23 +0200 |
| commit | 20dd0df8e39a60032adc6baaa3d21fadbc25516c (patch) | |
| tree | 4ee8d9abb664357ee8b6dcccee1e8f24ed43a61a | |
| parent | 41f25f4dea11f21599879cb6d3f5ebfa128105a1 (diff) | |
| download | android_hardware_samsung-20dd0df8e39a60032adc6baaa3d21fadbc25516c.tar.gz android_hardware_samsung-20dd0df8e39a60032adc6baaa3d21fadbc25516c.tar.bz2 android_hardware_samsung-20dd0df8e39a60032adc6baaa3d21fadbc25516c.zip | |
NFC refactoringcm-10.1.3-RC2cm-10.1.3-RC1
Change-Id: Id239eae364b7e1eddc512acb3516be1c62a726d1
| -rw-r--r-- | exynos4/exynos4x12/Android.mk | 2 | ||||
| -rw-r--r-- | exynos4/nfc/Android.mk (renamed from exynos4/exynos4x12/nfc/Android.mk) | 0 | ||||
| -rw-r--r-- | exynos4/nfc/nfc_hw.c (renamed from exynos4/exynos4x12/nfc/nfc_hw.c) | 0 | ||||
| -rw-r--r-- | exynos4210.mk | 5 | ||||
| -rw-r--r-- | exynos4x12.mk | 1 |
5 files changed, 7 insertions, 1 deletions
diff --git a/exynos4/exynos4x12/Android.mk b/exynos4/exynos4x12/Android.mk index 3d96ffa..5d6039f 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 index 1b82fa3..1b82fa3 100644 --- a/exynos4/exynos4x12/nfc/Android.mk +++ b/exynos4/nfc/Android.mk diff --git a/exynos4/exynos4x12/nfc/nfc_hw.c b/exynos4/nfc/nfc_hw.c index b604768..b604768 100644 --- a/exynos4/exynos4x12/nfc/nfc_hw.c +++ b/exynos4/nfc/nfc_hw.c diff --git a/exynos4210.mk b/exynos4210.mk index 218ad62..231456a 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 1ed3e12..02027cc 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 |