diff options
| author | jaekyun <jaekyun@chromium.org> | 2014-12-04 08:19:13 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-12-04 16:19:31 +0000 |
| commit | d5de7e4469af397027ca13927c4426baec270d4e (patch) | |
| tree | 1d0bfcd0dce30bac7faf19d6f79cf1ab3e7898fd /android_webview | |
| parent | ce662dde5e552e08c14dbb432c05a554e46b1534 (diff) | |
| download | chromium_src-d5de7e4469af397027ca13927c4426baec270d4e.zip chromium_src-d5de7e4469af397027ca13927c4426baec270d4e.tar.gz chromium_src-d5de7e4469af397027ca13927c4426baec270d4e.tar.bz2 | |
Upstream ResourceManager
And expose ResourceManager through the Compositor interface.
https://chrome-internal-review.googlesource.com/184331/ is a counter part in downstream.
BUG=426939
Review URL: https://codereview.chromium.org/731133002
Cr-Commit-Position: refs/heads/master@{#306830}
Diffstat (limited to 'android_webview')
| -rw-r--r-- | android_webview/java_library_common.mk | 1 | ||||
| -rw-r--r-- | android_webview/libwebviewchromium.gypi | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/android_webview/java_library_common.mk b/android_webview/java_library_common.mk index 56f36ac..15126cf 100644 --- a/android_webview/java_library_common.mk +++ b/android_webview/java_library_common.mk @@ -44,6 +44,7 @@ LOCAL_SRC_FILES += \ # Java files generated from .template rules. This list should match list of java dependencies in # android_webview/libwebviewchromium.gyp LOCAL_GENERATED_SOURCES := \ +$(call intermediates-dir-for,GYP,shared)/enums/android_resource_type_java/org/chromium/ui/resources/AndroidResourceType.java \ $(call intermediates-dir-for,GYP,shared)/enums/bitmap_format_java/org/chromium/ui/gfx/BitmapFormat.java \ $(call intermediates-dir-for,GYP,shared)/enums/cert_verify_status_android_java/org/chromium/net/CertVerifyStatusAndroid.java \ $(call intermediates-dir-for,GYP,shared)/enums/certificate_mime_types_java/org/chromium/net/CertificateMimeType.java \ diff --git a/android_webview/libwebviewchromium.gypi b/android_webview/libwebviewchromium.gypi index 099ca4b..8b2d40c 100644 --- a/android_webview/libwebviewchromium.gypi +++ b/android_webview/libwebviewchromium.gypi @@ -30,6 +30,7 @@ '../net/net.gyp:network_change_notifier_types_java', '../net/net.gyp:net_errors_java', '../net/net.gyp:private_key_types_java', + '../ui/android/ui_android.gyp:android_resource_type_java', '../ui/android/ui_android.gyp:bitmap_format_java', '../ui/android/ui_android.gyp:page_transition_types_java', '../ui/android/ui_android.gyp:system_ui_resource_type_java', |