diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-06-09 12:00:27 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-06-09 12:00:27 +0100 |
| commit | 46d4c2bc3267f3f028f39e7e311b0f89aba2e4fd (patch) | |
| tree | ed52337c337f5fd1db77873d9ff980ca3e334b35 /android_webview/Android.mk | |
| parent | 7ef4c70daab901f557268ad466f62cd2f7896916 (diff) | |
| download | chromium_org-46d4c2bc3267f3f028f39e7e311b0f89aba2e4fd.tar.gz | |
Merge from Chromium at DEPS revision 275586
This commit was generated by merge_to_master.py.
Change-Id: Ief3a0ffd810858bfddbe0ec5931e3ee90d53f78c
Diffstat (limited to 'android_webview/Android.mk')
| -rw-r--r-- | android_webview/Android.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/android_webview/Android.mk b/android_webview/Android.mk index dd9e13b843..525fb8422e 100644 --- a/android_webview/Android.mk +++ b/android_webview/Android.mk @@ -61,6 +61,8 @@ $(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chro $(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/content/browser/GestureEventType.java \ $(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/content/browser/PageTransitionTypes.java \ $(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/content/browser/SpeechRecognitionError.java \ +$(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/content/browser/input/CanonicalAxisIndex.java \ +$(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/content/browser/input/CanonicalButtonIndex.java \ $(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/content/browser/input/PopupItemType.java \ $(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/content/common/ResultCodes.java \ $(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/content/common/ScreenOrientationValues.java \ |