commit d3ff45985a827784da3cdb97609d29d456212d77
author Paul Duffin <paulduffin@google.com> Wed May 24 08:01:36 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed May 24 08:01:38 2017 +0000
tree ee8b3630c0392d81d0ceb5bb55809cba1204a75a
parent 0a76f9962140a42392d4bd5e4847c302f28c5f87
parent 1f0b6c816f9660e24fa3953813be4ef7e683a404

Merge "Fixed nfc-extras build files"

nfc-extras/Android.mk

diff --git a/nfc-extras/Android.mk b/nfc-extras/Android.mk
index cd7a45b..dc45a50 100644
--- a/nfc-extras/Android.mk
+++ b/nfc-extras/Android.mk
@@ -4,10 +4,10 @@
 
 LOCAL_MODULE_TAGS := optional
 
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-
-LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test
+LOCAL_SRC_FILES := $(call all-java-files-under, java)
 
 LOCAL_MODULE:= com.android.nfc_extras
 
 include $(BUILD_JAVA_LIBRARY)
+
+include $(call all-makefiles-under,$(LOCAL_PATH))

nfc-extras/tests/Android.mk

diff --git a/nfc-extras/tests/Android.mk b/nfc-extras/tests/Android.mk
index 3eca76d..d8fe5a6 100644
--- a/nfc-extras/tests/Android.mk
+++ b/nfc-extras/tests/Android.mk
@@ -22,6 +22,8 @@
     android.test.runner \
     com.android.nfc_extras
 
+LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test
+
 # Include all test java files.
 LOCAL_SRC_FILES := $(call all-java-files-under, src)