diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-03-21 14:25:57 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-03-21 14:25:57 +0000 |
| commit | 23730a6e56a168d1879203e4b3819bb36e3d8f1f (patch) | |
| tree | 4b72bdd217f9beda1d1b975e21c9d646a9664c48 /GypAndroid.linux-x86.mk | |
| parent | 6d6d338a36340632714f2aab9a266979b71c3442 (diff) | |
| download | chromium_org-23730a6e56a168d1879203e4b3819bb36e3d8f1f.tar.gz | |
Merge from Chromium at DEPS revision 258528
This commit was generated by merge_to_master.py.
Change-Id: Id197cbdde2c2881915f096c0426c741416884783
Diffstat (limited to 'GypAndroid.linux-x86.mk')
| -rw-r--r-- | GypAndroid.linux-x86.mk | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/GypAndroid.linux-x86.mk b/GypAndroid.linux-x86.mk index 3a39be35d5..11c0c79f70 100644 --- a/GypAndroid.linux-x86.mk +++ b/GypAndroid.linux-x86.mk @@ -31,8 +31,8 @@ include $(LOCAL_PATH)/components/autofill_core_browser.target.linux-x86.mk include $(LOCAL_PATH)/components/autofill_core_common.target.linux-x86.mk include $(LOCAL_PATH)/components/autofill_jni_headers.target.linux-x86.mk include $(LOCAL_PATH)/components/autofill_regexes.target.linux-x86.mk -include $(LOCAL_PATH)/components/component_resources.target.linux-x86.mk -include $(LOCAL_PATH)/components/component_strings.target.linux-x86.mk +include $(LOCAL_PATH)/components/components_resources.target.linux-x86.mk +include $(LOCAL_PATH)/components/components_strings.target.linux-x86.mk include $(LOCAL_PATH)/components/navigation_interception.target.linux-x86.mk include $(LOCAL_PATH)/components/navigation_interception_jni_headers.target.linux-x86.mk include $(LOCAL_PATH)/components/os_crypt.target.linux-x86.mk @@ -93,11 +93,6 @@ include $(LOCAL_PATH)/media/player_android.target.linux-x86.mk include $(LOCAL_PATH)/media/shared_memory_support.target.linux-x86.mk include $(LOCAL_PATH)/media/shared_memory_support_sse.target.linux-x86.mk include $(LOCAL_PATH)/media/video_capture_android_jni_headers.target.linux-x86.mk -include $(LOCAL_PATH)/mojo/mojo_common_lib.target.linux-x86.mk -include $(LOCAL_PATH)/mojo/mojo_environment_chromium.target.linux-x86.mk -include $(LOCAL_PATH)/mojo/mojo_environment_chromium_impl.target.linux-x86.mk -include $(LOCAL_PATH)/mojo/mojo_js_bindings_lib.target.linux-x86.mk -include $(LOCAL_PATH)/mojo/mojo_system.target.linux-x86.mk include $(LOCAL_PATH)/net/cert_verify_status_android_java.target.linux-x86.mk include $(LOCAL_PATH)/net/certificate_mime_types_java.target.linux-x86.mk include $(LOCAL_PATH)/net/http_server.target.linux-x86.mk |