Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1389)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/content.gyp

Issue 731133002: Upstream ResourceManager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix build failure Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« content/browser/renderer_host/compositor_impl_android.h ('K') | « content/browser/renderer_host/compositor_impl_android.cc ('k') | content/content_browser.gypi » ('j') | content/public/android/java/src/org/chromium/content_public/resources/ResourceManager.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content.gyp
diff --git a/content/content.gyp b/content/content.gyp
index 5a7355f7ff3fd67933bb1ac3e388368c31b0430a..2038a0cf5735261c3284d3cb1bc97bd9e8fedb5b 100644
--- a/content/content.gyp
+++ b/content/content.gyp
@@ -430,6 +430,7 @@
'../mojo/public/mojo_public.gyp:mojo_bindings_java',
'../net/net.gyp:net',
'../ui/android/ui_android.gyp:ui_java',
+ 'android_resource_type_java',
'common_aidl',
'content_common',
'content_strings_grd',
@@ -470,6 +471,14 @@
],
},
{
+ 'target_name': 'android_resource_type_java',
+ 'type': 'none',
+ 'variables': {
+ 'source_file': 'public/browser/android/resource_manager.h',
+ },
+ 'includes': [ '../build/android/java_cpp_enum.gypi' ],
+ },
+ {
'target_name': 'content_gamepad_mapping',
'type': 'none',
'variables': {
« content/browser/renderer_host/compositor_impl_android.h ('K') | « content/browser/renderer_host/compositor_impl_android.cc ('k') | content/content_browser.gypi » ('j') | content/public/android/java/src/org/chromium/content_public/resources/ResourceManager.java » ('J')

Powered by Google App Engine
This is Rietveld 408576698