Fix makefile issues with cts_audio_quality
* Don't assume the install location of BUILD_HOST_NATIVE_TEST, it's
changing from $(HOST_OUT)/bin to $(HOST_OUT)/nativetest...
* Remove temporary directories before use, to prevent incremental
issues.
* Don't use host libstdc++, use our static version of libc++. It was
actually linking to both, but falling back to the system's libc++,
which may not be compatible with our version.
* Don't include headers from /usr/include. Our builds should only be
using headers from the source tree.
Change-Id: Idebc0e4a3e4963d1126622b86b9d65b878c652a2
diff --git a/suite/audio_quality/executable/Android.mk b/suite/audio_quality/executable/Android.mk
index 8049596..26b5379 100644
--- a/suite/audio_quality/executable/Android.mk
+++ b/suite/audio_quality/executable/Android.mk
@@ -22,7 +22,8 @@
LOCAL_STATIC_LIBRARIES += libutils liblog libcutils libtinyalsa libtinyxml
LOCAL_WHOLE_STATIC_LIBRARIES := libcts_audio_quality
LOCAL_CFLAGS:= -g -fno-exceptions
-LOCAL_LDFLAGS:= -g -lrt -ldl -lstdc++ -lm -fno-exceptions -lpthread
+LOCAL_LDFLAGS:= -g -lrt -ldl -lm -fno-exceptions -lpthread
+LOCAL_CXX_STL := libc++_static
LOCAL_MODULE_HOST_OS := linux
LOCAL_MODULE:= cts_audio_quality
include $(BUILD_HOST_EXECUTABLE)