diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2009-07-25 17:48:02 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2009-07-25 17:48:02 -0700 |
| commit | ef9ede14790183212bf3ca51854a5ed6c4bc20e4 (patch) | |
| tree | df42c91f07c92e3d0fc1db9a8438e2089664f345 | |
| parent | fd842d956e1554cdf72141cd0deed601b3a862a6 (diff) | |
| parent | 1bfedbd04122c0e177caf693423aabad3462d66d (diff) | |
| download | srec-ef9ede14790183212bf3ca51854a5ed6c4bc20e4.tar.gz | |
Merge korg/donut into korg/master
| -rw-r--r-- | audio/test/AudioHardwareRecord/Android.mk | 2 | ||||
| -rw-r--r-- | audio/test/AudioHardwareRecordLoop/Android.mk | 2 | ||||
| -rw-r--r-- | srec/test/SRecTest/Android.mk | 2 | ||||
| -rw-r--r-- | srec/test/SRecTestAudio/Android.mk | 2 | ||||
| -rw-r--r-- | tools/grxmlcompile/netw_arc.h | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/audio/test/AudioHardwareRecord/Android.mk b/audio/test/AudioHardwareRecord/Android.mk index 184cfbf..91bb8f8 100644 --- a/audio/test/AudioHardwareRecord/Android.mk +++ b/audio/test/AudioHardwareRecord/Android.mk @@ -25,7 +25,7 @@ LOCAL_STATIC_LIBRARIES := \ LOCAL_MODULE:= AudioHardwareRecord -LOCAL_MODULE_TAGS := tests +LOCAL_MODULE_TAGS := optional LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES) diff --git a/audio/test/AudioHardwareRecordLoop/Android.mk b/audio/test/AudioHardwareRecordLoop/Android.mk index 4d04b17..99b8219 100644 --- a/audio/test/AudioHardwareRecordLoop/Android.mk +++ b/audio/test/AudioHardwareRecordLoop/Android.mk @@ -25,7 +25,7 @@ LOCAL_STATIC_LIBRARIES := \ LOCAL_MODULE:= AudioHardwareRecordLoop -LOCAL_MODULE_TAGS := tests +LOCAL_MODULE_TAGS := optional LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES) diff --git a/srec/test/SRecTest/Android.mk b/srec/test/SRecTest/Android.mk index 4223d0f..4ac3a52 100644 --- a/srec/test/SRecTest/Android.mk +++ b/srec/test/SRecTest/Android.mk @@ -38,6 +38,6 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_MODULE:= SRecTest -LOCAL_MODULE_TAGS := tests +LOCAL_MODULE_TAGS := optional include $(BUILD_EXECUTABLE) diff --git a/srec/test/SRecTestAudio/Android.mk b/srec/test/SRecTestAudio/Android.mk index b7c7296..e1ea4d3 100644 --- a/srec/test/SRecTestAudio/Android.mk +++ b/srec/test/SRecTestAudio/Android.mk @@ -44,6 +44,6 @@ LOCAL_STATIC_LIBRARIES := \ LOCAL_MODULE:= SRecTestAudio -LOCAL_MODULE_TAGS := tests +LOCAL_MODULE_TAGS := optional include $(BUILD_EXECUTABLE) diff --git a/tools/grxmlcompile/netw_arc.h b/tools/grxmlcompile/netw_arc.h index ed591de..e1d297e 100644 --- a/tools/grxmlcompile/netw_arc.h +++ b/tools/grxmlcompile/netw_arc.h @@ -23,7 +23,7 @@ #undef assert #define assert(X) - +#include <cstdio> class GRXMLDoc; class NUANArc |