diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2016-05-27 23:45:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-05-27 23:45:13 +0000 |
| commit | a3f1340ef2f1a598a79627e447f99649d0f1cabb (patch) | |
| tree | ad030bc136f8538ee7f12614a41921a1cea180d7 | |
| parent | 03569ad9a982bbce54926ae9382f2fa82acb9247 (diff) | |
| parent | c099d0574d8c5f097ec6ec5bf82185f83f70d528 (diff) | |
| download | cts-a3f1340ef2f1a598a79627e447f99649d0f1cabb.tar.gz | |
Merge "Fix makefile issues with cts_audio_quality"
| -rw-r--r-- | suite/audio_quality/Android.mk | 7 | ||||
| -rw-r--r-- | suite/audio_quality/executable/Android.mk | 3 | ||||
| -rw-r--r-- | suite/audio_quality/lib/Android.mk | 2 | ||||
| -rw-r--r-- | suite/audio_quality/test/Android.mk | 1 |
4 files changed, 8 insertions, 5 deletions
diff --git a/suite/audio_quality/Android.mk b/suite/audio_quality/Android.mk index 491596e7e71..c3404d25168 100644 --- a/suite/audio_quality/Android.mk +++ b/suite/audio_quality/Android.mk @@ -19,16 +19,19 @@ ifeq ($(HOST_OS),linux) 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 @@ ifneq ($(filter cts, $(MAKECMDGOALS)),) $(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 8049596e115..26b53796763 100644 --- a/suite/audio_quality/executable/Android.mk +++ b/suite/audio_quality/executable/Android.mk @@ -22,7 +22,8 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/../lib/include external/tinyalsa/include/ li 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 d4aaf84eab2..44fbebba530 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 ed0f4c964fa..5af29f050a2 100644 --- a/suite/audio_quality/test/Android.mk +++ b/suite/audio_quality/test/Android.mk @@ -37,6 +37,7 @@ LOCAL_STATIC_LIBRARIES := \ 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 |