summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2011-06-03 09:06:33 -0700
committerJean-Baptiste Queru <jbq@google.com>2011-06-03 12:36:01 -0700
commit4a4ccb43b1806bcff0e033db7dd38c5f02114b61 (patch)
treead7e5205bf55dd525738e83312067ad3abe7dfb1
parent1c80d85bf54fe360aacccf4d50df41d4f1784bd3 (diff)
downloaddevice_samsung_crespo-4a4ccb43b1806bcff0e033db7dd38c5f02114b61.zip
device_samsung_crespo-4a4ccb43b1806bcff0e033db7dd38c5f02114b61.tar.gz
device_samsung_crespo-4a4ccb43b1806bcff0e033db7dd38c5f02114b61.tar.bz2
Add NFC modules by default.
They had to be disabled for a while because of a crashing issue that has since been resolved. Change-Id: Ib4494d497136278b81eb5ff67c0ffa1b92f77d16
-rw-r--r--device_base.mk7
-rwxr-xr-xsetup-makefiles.sh7
2 files changed, 7 insertions, 7 deletions
diff --git a/device_base.mk b/device_base.mk
index 0b4f244..7b4255f 100644
--- a/device_base.mk
+++ b/device_base.mk
@@ -118,6 +118,13 @@ PRODUCT_PACKAGES += \
libstagefrighthw \
com.android.future.usb.accessory
+# NFC
+PRODUCT_PACKAGES += \
+ libnfc \
+ libnfc_jni \
+ Nfc \
+ Tag
+
# Input device calibration files
PRODUCT_COPY_FILES += \
device/samsung/crespo/mxt224_ts_input.idc:system/usr/idc/mxt224_ts_input.idc
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index 230bc67..916c1ea 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -48,13 +48,6 @@ PRODUCT_PACKAGES := \\
PRODUCT_COPY_FILES := \\
packages/wallpapers/LivePicker/android.software.live_wallpaper.xml:/system/etc/permissions/android.software.live_wallpaper.xml
-# NFC packages
-PRODUCT_PACKAGES += \\
- libnfc \\
- libnfc_jni \\
- Nfc \\
- Tag
-
# Pick up overlay for features that depend on non-open-source files
DEVICE_PACKAGE_OVERLAYS := vendor/__MANUFACTURER__/__DEVICE__/overlay