summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Pelly <npelly@google.com>2010-10-19 11:38:10 -0700
committerNick Pelly <npelly@google.com>2010-10-19 11:38:10 -0700
commit6cd49249026365af304d97b92e42e9efee184544 (patch)
treedba75bb2163d97cdeda5489c5e759b5fd48fc995
parentba1ce2f1cac75db3d8af14138f0876f2b77a4a67 (diff)
downloadpackages_apps_nfc-6cd49249026365af304d97b92e42e9efee184544.zip
packages_apps_nfc-6cd49249026365af304d97b92e42e9efee184544.tar.gz
packages_apps_nfc-6cd49249026365af304d97b92e42e9efee184544.tar.bz2
Don't build NFC service in master.
Change-Id: I0ef8bdd1587d6eee6a08f4e617050f8fa0cbd72c Signed-off-by: Nick Pelly <npelly@google.com>
-rwxr-xr-xAndroid.mk6
1 files changed, 4 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index b5ae045..e5b93b5 100755
--- a/Android.mk
+++ b/Android.mk
@@ -12,6 +12,8 @@ LOCAL_JNI_SHARED_LIBRARIES := libnfc_jni
LOCAL_PROGUARD_ENABLED := disabled
-include $(BUILD_PACKAGE)
+# dont build in master
+# temporary
+#include $(BUILD_PACKAGE)
-include $(call all-makefiles-under,$(LOCAL_PATH))
+#include $(call all-makefiles-under,$(LOCAL_PATH))