diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-08-30 15:14:49 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-08-30 15:14:49 +0100 |
| commit | 424c4d7b64af9d0d8fd9624f381f469654d5e3d2 (patch) | |
| tree | af8b16dc2ba7fc8c8bb1c9fa18b907c847f3883d /GypAndroid.linux-x86.mk | |
| parent | c70ef2906f891fe7d218980660e4cda465717916 (diff) | |
| download | chromium_org-424c4d7b64af9d0d8fd9624f381f469654d5e3d2.tar.gz | |
Merge from Chromium at DEPS revision r220549
This commit was generated by merge_to_master.py.
Change-Id: I8fcb82db764ec1eb0294280936c177bd9ba8a9e9
Diffstat (limited to 'GypAndroid.linux-x86.mk')
| -rw-r--r-- | GypAndroid.linux-x86.mk | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/GypAndroid.linux-x86.mk b/GypAndroid.linux-x86.mk index 0e437a73c9..bc08322e44 100644 --- a/GypAndroid.linux-x86.mk +++ b/GypAndroid.linux-x86.mk @@ -219,7 +219,6 @@ include $(LOCAL_PATH)/ui/base/strings/ui_strings.target.linux-x86.mk include $(LOCAL_PATH)/ui/gl/gl.target.linux-x86.mk include $(LOCAL_PATH)/ui/gl/gl_jni_headers.target.linux-x86.mk include $(LOCAL_PATH)/ui/gl/surface_jni_headers.target.linux-x86.mk -include $(LOCAL_PATH)/ui/gl/surface_texture_jni_headers.target.linux-x86.mk include $(LOCAL_PATH)/ui/native_theme/native_theme.target.linux-x86.mk include $(LOCAL_PATH)/ui/shell_dialogs.target.linux-x86.mk include $(LOCAL_PATH)/ui/snapshot/snapshot.target.linux-x86.mk |