diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-05-29 14:40:03 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-05-29 14:40:03 +0100 |
| commit | 90dce4d38c5ff5333bea97d859d4e484e27edf0c (patch) | |
| tree | 9c51c7dd97d24b15befa97a3482c51851e5383a1 /media/player_android.target.linux-x86.mk | |
| parent | 1515035f5917d10d363b0888a3615d581ad8b83f (diff) | |
| download | chromium_org-90dce4d38c5ff5333bea97d859d4e484e27edf0c.tar.gz | |
Merge from Chromium at DEPS revision r202854
This commit was generated by merge_to_master.py.
Change-Id: Idca323f71ef844a9e04f454d4f070b1e398f2deb
Diffstat (limited to 'media/player_android.target.linux-x86.mk')
| -rw-r--r-- | media/player_android.target.linux-x86.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/media/player_android.target.linux-x86.mk b/media/player_android.target.linux-x86.mk index bc0c5b7e01..9abe43ba23 100644 --- a/media/player_android.target.linux-x86.mk +++ b/media/player_android.target.linux-x86.mk @@ -11,9 +11,7 @@ gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := \ - $(call intermediates-dir-for,GYP,media_media_android_jni_headers_gyp)/media_android_jni_headers.stamp \ - $(call intermediates-dir-for,GYP,media_media_codec_jni_headers_gyp)/media_codec_jni_headers.stamp \ - $(call intermediates-dir-for,GYP,media_media_format_jni_headers_gyp)/media_format_jni_headers.stamp + $(call intermediates-dir-for,GYP,media_media_android_jni_headers_gyp)/media_android_jni_headers.stamp GYP_GENERATED_OUTPUTS := @@ -31,6 +29,7 @@ LOCAL_SRC_FILES := \ media/base/android/media_player_android.cc \ media/base/android/media_player_bridge.cc \ media/base/android/media_player_listener.cc \ + media/base/android/media_source_player.cc \ media/base/android/webaudio_media_codec_bridge.cc @@ -77,6 +76,7 @@ MY_DEFS := \ '-DNO_TCMALLOC' \ '-DDISABLE_NACL' \ '-DCHROMIUM_BUILD' \ + '-DENABLE_DOUBLE_RESOURCE_LOAD_TIMING' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_GPU=1' \ @@ -101,9 +101,9 @@ LOCAL_C_INCLUDES := \ $(gyp_shared_intermediate_dir)/media \ $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ $(LOCAL_PATH) \ - $(GYP_ABS_ANDROID_TOP_DIR)/frameworks/wilhelm/include \ - $(GYP_ABS_ANDROID_TOP_DIR)/bionic \ - $(GYP_ABS_ANDROID_TOP_DIR)/external/stlport/stlport + $(PWD)/frameworks/wilhelm/include \ + $(PWD)/bionic \ + $(PWD)/external/stlport/stlport LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES) |