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

Unified Diff: ui/android/ui_android.gyp

Issue 731133002: Upstream ResourceManager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix clang 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
Index: ui/android/ui_android.gyp
diff --git a/ui/android/ui_android.gyp b/ui/android/ui_android.gyp
index 578c205972372a8f09eb835835a2eb7d11970f88..10705a28a8440ae591d27e7fb7340ed5e69739a8 100644
--- a/ui/android/ui_android.gyp
+++ b/ui/android/ui_android.gyp
@@ -8,6 +8,53 @@
},
'targets': [
{
+ # GN version: //ui/android
+ 'target_name': 'ui_android',
+ 'type': '<(component)',
+ 'dependencies': [
+ '../../cc/cc.gyp:cc',
+ '../../base/base.gyp:base',
+ '../../skia/skia.gyp:skia',
+ '../gfx/gfx.gyp:gfx',
+ '../gfx/gfx.gyp:gfx_geometry',
+ 'ui_android_jni_headers',
+ ],
+ 'defines': [
+ 'UI_ANDROID_IMPLEMENTATION',
+ ],
+ 'sources' : [
+ 'resources/resource_manager.cc',
+ 'resources/resource_manager.h',
+ 'resources/ui_resource_android.cc',
+ 'resources/ui_resource_android.h',
+ 'ui_android_export.h',
+ 'ui_android_jni_registrar.cc',
+ 'ui_android_jni_registrar.h',
+ ],
+ 'include_dirs': [
+ '../..',
Ted C 2014/11/24 19:09:55 ?? this looks really generic. Do we need to inclu
Jaekyun Seok (inactive) 2014/11/24 23:36:56 I referred to other gyp files like ui/acceleromete
+ ],
+ },
+ {
+ 'target_name': 'ui_android_jni_headers',
+ 'type': 'none',
+ 'sources': [
+ 'java/src/org/chromium/ui/resources/ResourceManager.java',
+ ],
+ 'variables': {
+ 'jni_gen_package': 'ui',
+ },
+ 'includes': [ '../../build/jni_generator.gypi' ],
+ },
+ {
+ 'target_name': 'android_resource_type_java',
+ 'type': 'none',
+ 'variables': {
+ 'source_file': 'resources/resource_manager.h',
+ },
+ 'includes': [ '../../build/android/java_cpp_enum.gypi' ],
+ },
+ {
'target_name': 'bitmap_format_java',
'type': 'none',
'variables': {
@@ -50,6 +97,7 @@
},
'dependencies': [
'../../base/base.gyp:base_java',
+ 'android_resource_type_java',
'bitmap_format_java',
'page_transition_types_java',
'system_ui_resource_type_java',

Powered by Google App Engine
This is Rietveld 408576698