diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-11-06 12:27:47 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-11-06 12:27:47 +0000 |
| commit | 0f1bc08d4cfcc34181b0b5cbf065c40f687bf740 (patch) | |
| tree | 08e3fb2fdca3674ceb4d6cf527cb65e755cd993e /media/media.target.darwin-arm.mk | |
| parent | 0bdaf95291fc46702f274f40e8e5081e9ef23011 (diff) | |
| download | chromium_org-0f1bc08d4cfcc34181b0b5cbf065c40f687bf740.tar.gz | |
Merge from Chromium at DEPS revision 232870
This commit was generated by merge_to_master.py.
Change-Id: I9cd2139013538e8bcd17966e8ff30ca5651d1a3d
Diffstat (limited to 'media/media.target.darwin-arm.mk')
| -rw-r--r-- | media/media.target.darwin-arm.mk | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/media/media.target.darwin-arm.mk b/media/media.target.darwin-arm.mk index 3521eac703..a099739ef6 100644 --- a/media/media.target.darwin-arm.mk +++ b/media/media.target.darwin-arm.mk @@ -13,7 +13,6 @@ gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) GYP_TARGET_DEPENDENCIES := \ $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \ - $(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \ $(call intermediates-dir-for,GYP,media_media_android_jni_headers_gyp)/media_android_jni_headers.stamp \ $(call intermediates-dir-for,GYP,media_video_capture_android_jni_headers_gyp)/video_capture_android_jni_headers.stamp @@ -56,6 +55,9 @@ LOCAL_SRC_FILES := \ media/audio/sample_rates.cc \ media/audio/scoped_loop_observer.cc \ media/audio/simple_sources.cc \ + media/audio/sounds/audio_stream_handler.cc \ + media/audio/sounds/sounds_manager.cc \ + media/audio/sounds/wav_audio_handler.cc \ media/audio/virtual_audio_input_stream.cc \ media/audio/virtual_audio_output_stream.cc \ media/base/android/demuxer_stream_player_params.cc \ @@ -231,10 +233,11 @@ MY_DEFS_Debug := \ '-DSK_SUPPORT_GPU=1' \ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ + '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ + '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ - '-DU_USING_ICU_NAMESPACE=0' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ @@ -269,8 +272,6 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/skia/ext \ $(LOCAL_PATH)/third_party/opus/src/include \ - $(PWD)/external/icu4c/common \ - $(PWD)/external/icu4c/i18n \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -342,10 +343,11 @@ MY_DEFS_Release := \ '-DSK_SUPPORT_GPU=1' \ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ + '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ + '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ - '-DU_USING_ICU_NAMESPACE=0' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ @@ -381,8 +383,6 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/skia/ext \ $(LOCAL_PATH)/third_party/opus/src/include \ - $(PWD)/external/icu4c/common \ - $(PWD)/external/icu4c/i18n \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -446,8 +446,7 @@ LOCAL_LDFLAGS_Release := \ LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) LOCAL_STATIC_LIBRARIES := \ - skia_skia_library_gyp \ - ui_ui_gyp + skia_skia_library_gyp # Enable grouping to fix circular references LOCAL_GROUP_STATIC_LIBRARIES := true |