diff options
| author | Mitchell Wills <mwills@google.com> | 2016-03-25 21:21:29 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-03-25 21:21:29 +0000 |
| commit | ee97dbe41341f72eb8a56af2899f19f9ac823935 (patch) | |
| tree | 7b024ae7c6262fa4aae1143d65bb6e9d601efb87 | |
| parent | 96d42c4198ca91a5a24af3ec6da41715dc08e4aa (diff) | |
| parent | 2977ce6833c307ce5a597c56060567da4707f8bb (diff) | |
Merge "Cleanup Wifi tests makefile" into nyc-dev
| -rw-r--r-- | tests/wifitests/Android.mk | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/tests/wifitests/Android.mk b/tests/wifitests/Android.mk index 32ae15938..d968460d3 100644 --- a/tests/wifitests/Android.mk +++ b/tests/wifitests/Android.mk @@ -100,18 +100,24 @@ LOCAL_JACK_FLAGS := \ -D jack.coverage.jacoco.include=$(jacoco_include) \ -D jack.coverage.jacoco.exclude=$(jacoco_exclude) +# wifi-service and services must be included here so that the latest changes +# will be used when tests. Otherwise the tests would run against the installed +# system. +# TODO figure out if this is the correct thing to do, this seems to not be right +# since neither is declared a static java library. LOCAL_STATIC_JAVA_LIBRARIES := \ - mockito-target \ android-support-test \ + mockito-target \ + services \ wifi-service \ - services -LOCAL_JAVA_LIBRARIES := android.test.runner \ - mockito-target \ - android-support-test \ +LOCAL_JAVA_LIBRARIES := \ + android.test.runner \ wifi-service \ - services + services \ +# These must be explicitly included because they are not normally accessible +# from apps. LOCAL_JNI_SHARED_LIBRARIES := \ libwifi-service \ libc++ \ @@ -129,8 +135,7 @@ LOCAL_JNI_SHARED_LIBRARIES := \ liblzma \ ifdef WPA_SUPPLICANT_VERSION -LOCAL_JNI_SHARED_LIBRARIES := $(LOCAL_JNI_SHARED_LIBRARIES) \ - libwpa_client +LOCAL_JNI_SHARED_LIBRARIES += libwpa_client endif LOCAL_PACKAGE_NAME := FrameworksWifiTests |