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/Android.mk b/suite/audio_quality/Android.mk
index 491596e..c3404d2 100644
--- a/suite/audio_quality/Android.mk
+++ b/suite/audio_quality/Android.mk
@@ -19,16 +19,19 @@
CTS_AUDIO_TOP:= $(call my-dir)
+include $(call all-makefiles-under,$(CTS_AUDIO_TOP))
+
CTS_AUDIO_INSTALL_DIR := $(HOST_OUT)/cts-audio-quality/android-cts-audio-quality
CTS_AUDIO_QUALITY_ZIP := $(HOST_OUT)/cts-audio-quality/android-cts-audio-quality.zip
cts_audio_quality_client_apk := $(TARGET_OUT_DATA_APPS)/CtsAudioClient/CtsAudioClient.apk
-cts_audio_quality_host_bins := $(HOST_OUT)/bin/cts_audio_quality_test $(HOST_OUT)/bin/cts_audio_quality
+cts_audio_quality_host_bins := $(ALL_MODULES.cts_audio_quality_test.INSTALLED) $(ALL_MODULES.cts_audio_quality.INSTALLED)
$(CTS_AUDIO_QUALITY_ZIP): PRIVATE_CLIENT_APK := $(cts_audio_quality_client_apk)
$(CTS_AUDIO_QUALITY_ZIP): PRIVATE_HOST_BINS := $(cts_audio_quality_host_bins)
$(CTS_AUDIO_QUALITY_ZIP): PRIVATE_TEST_DESC := $(CTS_AUDIO_TOP)/test_description
$(CTS_AUDIO_QUALITY_ZIP): $(cts_audio_quality_client_apk) $(cts_audio_quality_host_bins) \
$(CTS_AUDIO_TOP)/test_description | $(ACP)
+ $(hide) rm -rf $@ $(CTS_AUDIO_INSTALL_DIR)
$(hide) mkdir -p $(CTS_AUDIO_INSTALL_DIR)/client
$(hide) $(ACP) -fp $(PRIVATE_CLIENT_APK) \
$(CTS_AUDIO_INSTALL_DIR)/client
@@ -51,6 +54,4 @@
$(call dist-for-goals, cts, $(CTS_AUDIO_QUALITY_ZIP))
endif # cts
-include $(call all-subdir-makefiles)
-
endif # linux
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)
diff --git a/suite/audio_quality/lib/Android.mk b/suite/audio_quality/lib/Android.mk
index d4aaf84..44fbebb 100644
--- a/suite/audio_quality/lib/Android.mk
+++ b/suite/audio_quality/lib/Android.mk
@@ -17,7 +17,7 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(call all-subdir-cpp-files)
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/include $(LOCAL_PATH)/src /usr/include/ \
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/include $(LOCAL_PATH)/src \
external/tinyalsa/include/ external/tinyxml/ libcore/include
LOCAL_STATIC_LIBRARIES += libutils liblog libtinyalsa libcutils libtinyxml
LOCAL_CFLAGS:= -g -fno-exceptions
diff --git a/suite/audio_quality/test/Android.mk b/suite/audio_quality/test/Android.mk
index ed0f4c9..5af29f0 100644
--- a/suite/audio_quality/test/Android.mk
+++ b/suite/audio_quality/test/Android.mk
@@ -37,6 +37,7 @@
LOCAL_WHOLE_STATIC_LIBRARIES := libcts_audio_quality
LOCAL_CFLAGS:= -g -fno-exceptions
LOCAL_LDFLAGS:= -g -lrt -ldl -lm -fno-exceptions -lpthread
+LOCAL_CXX_STL := libc++_static
LOCAL_MODULE_HOST_OS := linux
LOCAL_MODULE := cts_audio_quality_test
LOCAL_MULTILIB := first