diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-09-19 22:36:51 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-09-19 22:36:51 +0100 |
| commit | d0247b1b59f9c528cb6df88b4f2b9afaf80d181e (patch) | |
| tree | 5c397fadc190cc71bffe2ffad1efc27a5b95309d /GypAndroid.linux-x86.mk | |
| parent | f7571f5f07547e2f3e0addf48d1f2a7ec3632957 (diff) | |
| download | chromium_org-d0247b1b59f9c528cb6df88b4f2b9afaf80d181e.tar.gz | |
Merge from Chromium at DEPS revision 224184
This commit was generated by merge_to_master.py.
Change-Id: Ia3424df5abed9bea642c522b9e2358dceabd8423
Diffstat (limited to 'GypAndroid.linux-x86.mk')
| -rw-r--r-- | GypAndroid.linux-x86.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/GypAndroid.linux-x86.mk b/GypAndroid.linux-x86.mk index bc08322e44..28e5f8ccd0 100644 --- a/GypAndroid.linux-x86.mk +++ b/GypAndroid.linux-x86.mk @@ -73,6 +73,7 @@ include $(LOCAL_PATH)/gpu/gpu_ipc.target.linux-x86.mk include $(LOCAL_PATH)/ipc/ipc.target.linux-x86.mk include $(LOCAL_PATH)/jingle/jingle_glue.target.linux-x86.mk include $(LOCAL_PATH)/media/media.target.linux-x86.mk +include $(LOCAL_PATH)/media/media_android_imageformat_list.target.linux-x86.mk include $(LOCAL_PATH)/media/media_android_jni_headers.target.linux-x86.mk include $(LOCAL_PATH)/media/media_asm.target.linux-x86.mk include $(LOCAL_PATH)/media/media_mmx.target.linux-x86.mk @@ -105,9 +106,8 @@ include $(LOCAL_PATH)/skia/skia_opts_ssse3.target.linux-x86.mk include $(LOCAL_PATH)/sql/sql.target.linux-x86.mk include $(LOCAL_PATH)/testing/gtest_prod.target.linux-x86.mk include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/bindings_derived_sources.target.linux-x86.mk -include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/deprecated_perl_bindings_sources.target.linux-x86.mk +include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/bindings_sources.target.linux-x86.mk include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/interface_dependencies.target.linux-x86.mk -include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/python_bindings_sources.target.linux-x86.mk include $(LOCAL_PATH)/third_party/WebKit/Source/config.target.linux-x86.mk include $(LOCAL_PATH)/third_party/WebKit/Source/core/debugger_script_source.target.linux-x86.mk include $(LOCAL_PATH)/third_party/WebKit/Source/core/generate_inspector_protocol_version.target.linux-x86.mk |