From 90a986caa1656a3da119f21c73aff1bd0a32faad Mon Sep 17 00:00:00 2001 From: "boliu@chromium.org" Date: Fri, 3 May 2013 17:14:49 +0000 Subject: [PATCH] Fix downstream android webview build Add template generated java file introduced in r198124. This does not affect upstream chromium build. TBR=torne@chromium.org NOTRY=true BUG= Review URL: https://chromiumcodereview.appspot.com/14644013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198135 0039d316-1c4b-4281-b951-d872f2087c98 --- android_webview/Android.mk | 1 + android_webview/all_webview.gyp | 1 + 2 files changed, 2 insertions(+) diff --git a/android_webview/Android.mk b/android_webview/Android.mk index 4b707fb5e115..834b2c77295f 100644 --- a/android_webview/Android.mk +++ b/android_webview/Android.mk @@ -51,6 +51,7 @@ LOCAL_SRC_FILES += \ # Java files generated from .template rules. This list should match list of java dependencies in # android_webview/all_webview.gyp LOCAL_GENERATED_SOURCES := \ +$(call intermediates-dir-for,GYP,shared)/templates/org/chromium/base/ActivityState.java \ $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content/browser/PageTransitionTypes.java \ $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content/common/ResultCodes.java \ $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/net/CertificateMimeType.java \ diff --git a/android_webview/all_webview.gyp b/android_webview/all_webview.gyp index 2ed5c82f24f0..e4dbddd4b728 100644 --- a/android_webview/all_webview.gyp +++ b/android_webview/all_webview.gyp @@ -15,6 +15,7 @@ 'android_webview.gyp:libwebviewchromium', # Needed by android_webview_java + '../base/base.gyp:base_java_activity_state', '../content/content.gyp:page_transition_types_java', '../content/content.gyp:result_codes_java', '../net/net.gyp:certificate_mime_types_java',