Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixed nfc-extras build files"

Browse Source
This commit is contained in:
Paul Duffin
2017-05-24 08:01:36 +00:00
committed by Gerrit Code Review
parent 0a76f99621 1f0b6c816f
commit d3ff45985a
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
nfc-extras/Android.mk
View File

@@ -4,10 +4,10 @@ include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_SRC_FILES := $(call all-java-files-under, java)
LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test
LOCAL_MODULE:= com.android.nfc_extras LOCAL_MODULE:= com.android.nfc_extras
include $(BUILD_JAVA_LIBRARY) include $(BUILD_JAVA_LIBRARY)
include $(call all-makefiles-under,$(LOCAL_PATH))

2
nfc-extras/tests/Android.mk
View File

@@ -22,6 +22,8 @@ LOCAL_JAVA_LIBRARIES := \
android.test.runner \ android.test.runner \
com.android.nfc_extras com.android.nfc_extras
LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test
# Include all test java files. # Include all test java files.
LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SRC_FILES := $(call all-java-files-under, src)