diff options
| author | Paul Duffin <paulduffin@google.com> | 2017-05-22 15:58:56 +0100 |
|---|---|---|
| committer | Paul Duffin <paulduffin@google.com> | 2017-05-23 11:51:15 +0100 |
| commit | 1f0b6c816f9660e24fa3953813be4ef7e683a404 (patch) | |
| tree | c031d9a316a47853e68be18c974064ead24912d5 /nfc-extras | |
| parent | ec1f25a4ba588051cdf141c33af2f9dd06ddc40c (diff) | |
Fixed nfc-extras build files
The com.android.nfc_extras target was including the test class.
The nfc-extras/tests/Android.mk file was not being included so
was not being built by continuous build and could not be built
using make NfcExtrasTests.
Bug: 38487370
Bug: 30188076
Test: make checkbuild
Change-Id: I17f6723b899f26de329a2e74177bd02ba864b7b2
Diffstat (limited to 'nfc-extras')
| -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) |