diff options
| author | 2017-05-24 08:01:36 +0000 | |
|---|---|---|
| committer | 2017-05-24 08:01:38 +0000 | |
| commit | d3ff45985a827784da3cdb97609d29d456212d77 (patch) | |
| tree | ee8b3630c0392d81d0ceb5bb55809cba1204a75a | |
| parent | 0a76f9962140a42392d4bd5e4847c302f28c5f87 (diff) | |
| parent | 1f0b6c816f9660e24fa3953813be4ef7e683a404 (diff) | |
Merge "Fixed nfc-extras build files"
| -rw-r--r-- | nfc-extras/Android.mk | 6 | ||||
| -rw-r--r-- | nfc-extras/tests/Android.mk | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/nfc-extras/Android.mk b/nfc-extras/Android.mk index cd7a45b577de..dc45a50968f6 100644 --- a/nfc-extras/Android.mk +++ b/nfc-extras/Android.mk @@ -4,10 +4,10 @@ include $(CLEAR_VARS) 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)) diff --git a/nfc-extras/tests/Android.mk b/nfc-extras/tests/Android.mk index 3eca76d40504..d8fe5a6cca30 100644 --- a/nfc-extras/tests/Android.mk +++ b/nfc-extras/tests/Android.mk @@ -22,6 +22,8 @@ LOCAL_JAVA_LIBRARIES := \ 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) |