diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-06-19 11:58:07 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-06-19 11:58:07 +0100 |
| commit | 7d4cd473f85ac64c3747c96c277f9e506a0d2246 (patch) | |
| tree | f5fecd524f5ac22cd38bcc6713b81f666730d5a1 /media/player_android.target.linux-mips.mk | |
| parent | 84f2b2352908c30e40ae12ffe850dd8470f6c048 (diff) | |
| download | chromium_org-7d4cd473f85ac64c3747c96c277f9e506a0d2246.tar.gz | |
Merge from Chromium at DEPS revision r207203
This commit was generated by merge_to_master.py.
Change-Id: I5fbb6854d092096c4d39edc2865a48be1b53c418
Diffstat (limited to 'media/player_android.target.linux-mips.mk')
| -rw-r--r-- | media/player_android.target.linux-mips.mk | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/media/player_android.target.linux-mips.mk b/media/player_android.target.linux-mips.mk index a6bdf4adb1..0164f150f3 100644 --- a/media/player_android.target.linux-mips.mk +++ b/media/player_android.target.linux-mips.mk @@ -11,6 +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,STATIC_LIBRARIES,ui_gl_gl_gyp)/ui_gl_gl_gyp.a \ $(call intermediates-dir-for,GYP,media_media_android_jni_headers_gyp)/media_android_jni_headers.stamp GYP_GENERATED_OUTPUTS := @@ -25,6 +26,7 @@ GYP_COPIED_SOURCE_ORIGIN_DIRS := LOCAL_SRC_FILES := \ media/base/android/media_codec_bridge.cc \ + media/base/android/media_drm_bridge.cc \ media/base/android/media_jni_registrar.cc \ media/base/android/media_player_android.cc \ media/base/android/media_player_bridge.cc \ @@ -71,6 +73,7 @@ MY_CFLAGS := \ MY_CFLAGS_C := MY_DEFS := \ + '-DANGLE_DX11' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ '-DDISABLE_NACL' \ @@ -98,7 +101,13 @@ LOCAL_CFLAGS := $(MY_CFLAGS_C) $(MY_CFLAGS) $(MY_DEFS) LOCAL_C_INCLUDES := \ $(gyp_shared_intermediate_dir)/media \ $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ + $(LOCAL_PATH)/third_party/khronos \ + $(LOCAL_PATH)/gpu \ + $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH) \ + $(gyp_shared_intermediate_dir)/ui/gl \ + $(LOCAL_PATH)/third_party/mesa/src/include \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -135,7 +144,8 @@ LOCAL_LDFLAGS := \ -Wl,--as-needed -LOCAL_STATIC_LIBRARIES := +LOCAL_STATIC_LIBRARIES := \ + ui_gl_gl_gyp # Enable grouping to fix circular references LOCAL_GROUP_STATIC_LIBRARIES := true |