diff options
| author | Ben Murdoch <benm@google.com> | 2014-07-20 18:25:52 -0700 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2014-07-20 18:25:52 -0700 |
| commit | 116680a4aac90f2aa7413d9095a592090648e557 (patch) | |
| tree | f7c6fed0e63d6a2804243d4a31a752dca39fb076 /GypAndroid.linux-arm.mk | |
| parent | 1f14a4515e04c9ffc9bac4dd1e2f68611626b800 (diff) | |
| download | chromium_org-116680a4aac90f2aa7413d9095a592090648e557.tar.gz | |
Merge from Chromium at DEPS revision 284076
This commit was generated by merge_to_master.py.
Change-Id: I9a279485b02fe7ceddcd32d992a714ff132e99ae
Diffstat (limited to 'GypAndroid.linux-arm.mk')
| -rw-r--r-- | GypAndroid.linux-arm.mk | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/GypAndroid.linux-arm.mk b/GypAndroid.linux-arm.mk index c57e255bc6..cf2d455af3 100644 --- a/GypAndroid.linux-arm.mk +++ b/GypAndroid.linux-arm.mk @@ -112,6 +112,7 @@ include $(LOCAL_PATH)/mojo/mojo_environment_chromium.target.linux-arm.mk include $(LOCAL_PATH)/mojo/mojo_environment_chromium_impl.target.linux-arm.mk include $(LOCAL_PATH)/mojo/mojo_js_bindings.target.linux-arm.mk include $(LOCAL_PATH)/mojo/mojo_js_bindings_lib.target.linux-arm.mk +include $(LOCAL_PATH)/mojo/mojo_none.target.linux-arm.mk include $(LOCAL_PATH)/mojo/mojo_service_manager.target.linux-arm.mk include $(LOCAL_PATH)/mojo/mojo_service_provider_bindings.target.linux-arm.mk include $(LOCAL_PATH)/mojo/mojo_system_impl.target.linux-arm.mk @@ -188,7 +189,6 @@ include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/build_network_module.ta include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/build_profiler_module.target.linux-arm.mk include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/build_resources_module.target.linux-arm.mk include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/build_script_formatter_worker_module.target.linux-arm.mk -include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/build_search_module.target.linux-arm.mk include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/build_settings_module.target.linux-arm.mk include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/build_source_frame_module.target.linux-arm.mk include $(LOCAL_PATH)/third_party/WebKit/Source/devtools/build_sources_module.target.linux-arm.mk @@ -238,6 +238,7 @@ include $(LOCAL_PATH)/third_party/icu/icuuc.target.linux-arm.mk include $(LOCAL_PATH)/third_party/icu/system_icu.target.linux-arm.mk include $(LOCAL_PATH)/third_party/khronos/khronos_headers.target.linux-arm.mk include $(LOCAL_PATH)/third_party/leveldatabase/leveldatabase.target.linux-arm.mk +include $(LOCAL_PATH)/third_party/libaddressinput/libaddressinput_strings.target.linux-arm.mk include $(LOCAL_PATH)/third_party/libaddressinput/libaddressinput_util.target.linux-arm.mk include $(LOCAL_PATH)/third_party/libevent/libevent.target.linux-arm.mk include $(LOCAL_PATH)/third_party/libjingle/libjingle.target.linux-arm.mk @@ -349,6 +350,7 @@ include $(LOCAL_PATH)/ui/events/platform/events_platform.target.linux-arm.mk include $(LOCAL_PATH)/ui/gfx/gfx.target.linux-arm.mk include $(LOCAL_PATH)/ui/gfx/gfx_geometry.target.linux-arm.mk include $(LOCAL_PATH)/ui/gfx/gfx_jni_headers.target.linux-arm.mk +include $(LOCAL_PATH)/ui/gfx/ipc/gfx_ipc.target.linux-arm.mk include $(LOCAL_PATH)/ui/gl/gl.target.linux-arm.mk include $(LOCAL_PATH)/ui/gl/gl_jni_headers.target.linux-arm.mk include $(LOCAL_PATH)/ui/gl/surface_jni_headers.target.linux-arm.mk @@ -367,6 +369,7 @@ include $(LOCAL_PATH)/v8/tools/gyp/v8_base.host.linux-arm.mk include $(LOCAL_PATH)/v8/tools/gyp/v8_base.target.linux-arm.mk include $(LOCAL_PATH)/v8/tools/gyp/v8_libbase.host.linux-arm.mk include $(LOCAL_PATH)/v8/tools/gyp/v8_libbase.target.linux-arm.mk +include $(LOCAL_PATH)/v8/tools/gyp/v8_libplatform.host.linux-arm.mk include $(LOCAL_PATH)/v8/tools/gyp/v8_nosnapshot.host.linux-arm.mk include $(LOCAL_PATH)/v8/tools/gyp/v8_snapshot.target.linux-arm.mk include $(LOCAL_PATH)/webkit/child/overscroller_jni_headers.target.linux-arm.mk |