summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorboliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-12 16:45:10 +0000
committerboliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-12 16:45:10 +0000
commit1b61243e8d0af40ee63fc4aebb3383496d097ff4 (patch)
treeef1de0721e4015b89dde4338e5951dfaaba6296d
parentb7fc8984a530feb9b988c76ac65494419f287bd4 (diff)
downloadchromium_src-1b61243e8d0af40ee63fc4aebb3383496d097ff4.zip
chromium_src-1b61243e8d0af40ee63fc4aebb3383496d097ff4.tar.gz
chromium_src-1b61243e8d0af40ee63fc4aebb3383496d097ff4.tar.bz2
Fix Android WebView build after r205796
Add MemoryPressureLevelList to list of template generated files. NOTRY=true BUG= Review URL: https://chromiumcodereview.appspot.com/16408022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205823 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--android_webview/Android.mk1
-rw-r--r--android_webview/all_webview.gyp1
2 files changed, 2 insertions, 0 deletions
diff --git a/android_webview/Android.mk b/android_webview/Android.mk
index 834b2c7..9b8270e 100644
--- a/android_webview/Android.mk
+++ b/android_webview/Android.mk
@@ -52,6 +52,7 @@ LOCAL_SRC_FILES += \
# 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/base/MemoryPressureLevelList.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 e4dbddd..286d84d 100644
--- a/android_webview/all_webview.gyp
+++ b/android_webview/all_webview.gyp
@@ -16,6 +16,7 @@
# Needed by android_webview_java
'../base/base.gyp:base_java_activity_state',
+ '../base/base.gyp:base_java_memory_pressure_level_list',
'../content/content.gyp:page_transition_types_java',
'../content/content.gyp:result_codes_java',
'../net/net.gyp:certificate_mime_types_java',