diff --git a/audio_utils/tests/Android.mk b/audio_utils/tests/Android.mk
index 0db09dc..cd76cf0 100644
--- a/audio_utils/tests/Android.mk
+++ b/audio_utils/tests/Android.mk
@@ -1,26 +1,37 @@
 # Build the unit tests for audio_utils
 
 LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
 
+include $(CLEAR_VARS)
 LOCAL_SHARED_LIBRARIES := \
 	liblog \
 	libcutils \
 	libaudioutils
-
 LOCAL_C_INCLUDES := \
 	$(call include-path-for, audio-utils)
-
 LOCAL_SRC_FILES := \
 	primitives_tests.cpp
-
 LOCAL_MODULE := primitives_tests
 LOCAL_MODULE_TAGS := tests
-
 LOCAL_CFLAGS := -Werror -Wall
 include $(BUILD_NATIVE_TEST)
 
 include $(CLEAR_VARS)
+LOCAL_SHARED_LIBRARIES := \
+	liblog \
+	libcutils
+LOCAL_STATIC_LIBRARIES := \
+	libaudioutils
+LOCAL_C_INCLUDES := \
+	$(call include-path-for, audio-utils)
+LOCAL_SRC_FILES := \
+	primitives_tests.cpp
+LOCAL_MODULE := primitives_tests
+LOCAL_MODULE_TAGS := tests
+LOCAL_CFLAGS := -Werror -Wall
+include $(BUILD_HOST_NATIVE_TEST)
+
+include $(CLEAR_VARS)
 LOCAL_SRC_FILES := fifo_tests.cpp
 LOCAL_MODULE := fifo_tests
 LOCAL_C_INCLUDES := $(call include-path-for, audio-utils)