summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorJason parks <jparks@google.com>2011-05-24 10:27:34 -0500
committerJason parks <jparks@google.com>2011-05-24 10:30:54 -0500
commit6817861dcc9c88366b56fafe0500e27abfcaafda (patch)
tree4acc80d1d11597bec9c0c5c626fb41e0994f00d2 /Android.mk
parentf28e772d7848251136bffaa8d2cef086fb01f24a (diff)
downloadpackages_apps_nfc-6817861dcc9c88366b56fafe0500e27abfcaafda.zip
packages_apps_nfc-6817861dcc9c88366b56fafe0500e27abfcaafda.tar.gz
packages_apps_nfc-6817861dcc9c88366b56fafe0500e27abfcaafda.tar.bz2
Re-enable nfc.
Diffstat (limited to 'Android.mk')
-rwxr-xr-xAndroid.mk6
1 files changed, 2 insertions, 4 deletions
diff --git a/Android.mk b/Android.mk
index e5b93b5..b5ae045 100755
--- a/Android.mk
+++ b/Android.mk
@@ -12,8 +12,6 @@ LOCAL_JNI_SHARED_LIBRARIES := libnfc_jni
LOCAL_PROGUARD_ENABLED := disabled
-# dont build in master
-# temporary
-#include $(BUILD_PACKAGE)
+include $(BUILD_PACKAGE)
-#include $(call all-makefiles-under,$(LOCAL_PATH))
+include $(call all-makefiles-under,$(LOCAL_PATH))