WiFi Loop Stress Test - move to /data

Change-Id: I37f30c6e6e6eb189211591e7710ea5e086d8e4f6

diff --git a/tests/lib/testUtil/Android.mk b/tests/lib/testUtil/Android.mk
index 6af5603..42758ae 100644 (file)
--- a/tests/lib/testUtil/Android.mk
+++ b/tests/lib/testUtil/Android.mk
@@ -17,11 +17,12 @@
 LOCAL_PATH:= $(call my-dir)
 
 include $(CLEAR_VARS)
+LOCAL_MODULE_TAGS := tests
+LOCAL_MODULE:= libtestUtil
 LOCAL_SRC_FILES:= testUtil.c
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../include
 LOCAL_CFLAGS += -std=c99
 LOCAL_SHARED_LIBRARIES += libcutils libutils
 LOCAL_PRELINK_MODULE := false
-LOCAL_MODULE:= libtestUtil
-LOCAL_MODULE_TAGS := optional
-include $(BUILD_SHARED_LIBRARY)
+
+include $(BUILD_STATIC_LIBRARY)

diff --git a/tests/wifi/stress/Android.mk b/tests/wifi/stress/Android.mk
index 176b7f9..dd78e4f 100644 (file)
--- a/tests/wifi/stress/Android.mk
+++ b/tests/wifi/stress/Android.mk
@@ -17,11 +17,12 @@
 LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
+LOCAL_MODULE_TAGS := tests
 LOCAL_MODULE := wifiLoadScanAssoc_test
-LOCAL_MODULE_TAGS := eng tests
-LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/nativestresstest/$(LOCAL_MODULE)
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/nativestresstest
 LOCAL_SRC_FILES := wifiLoadScanAssoc_test.c
-LOCAL_SHARED_LIBRARIES += libcutils libutils libtestUtil libhardware_legacy
+LOCAL_SHARED_LIBRARIES += libcutils libutils libhardware_legacy
+LOCAL_STATIC_LIBRARIES += libtestUtil
 LOCAL_C_INCLUDES += system/extras/tests/include \
     hardware/libhardware_legacy/include