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

Unified Diff: ui/android/ui_android.gyp

Issue 755643004: Replace SystemUIResourceManager with ResourceManager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix clang build failure Created 6 years 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
« no previous file with comments | « ui/android/run_all_unittests.cc ('k') | ui/base/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/android/ui_android.gyp
diff --git a/ui/android/ui_android.gyp b/ui/android/ui_android.gyp
index 59002bdef84709bbb3c7cc30cb432e191102aca6..943b41b2b3a2c9a1c236f81cee9a601cb2a929fb 100644
--- a/ui/android/ui_android.gyp
+++ b/ui/android/ui_android.gyp
@@ -12,8 +12,8 @@
'target_name': 'ui_android',
'type': '<(component)',
'dependencies': [
- '../../cc/cc.gyp:cc',
'../../base/base.gyp:base',
+ '../../cc/cc.gyp:cc',
'../../skia/skia.gyp:skia',
'../gfx/gfx.gyp:gfx',
'../gfx/gfx.gyp:gfx_geometry',
@@ -27,6 +27,9 @@
'resources/resource_manager.h',
'resources/ui_resource_android.cc',
'resources/ui_resource_android.h',
+ 'resources/ui_resource_client_android.h',
+ 'resources/ui_resource_provider.cc',
+ 'resources/ui_resource_provider.h',
'ui_android_export.h',
'ui_android_jni_registrar.cc',
'ui_android_jni_registrar.h',
@@ -145,5 +148,38 @@
'../../build/java_strings_grd.gypi',
],
},
+ {
+ # GN version: //ui/android:ui_android_unittests
+ 'target_name': 'ui_android_unittests',
+ 'type': '<(gtest_target_type)',
+ 'dependencies': [
+ '../../base/base.gyp:base',
+ '../../base/base.gyp:test_support_base',
+ '../../cc/cc.gyp:cc',
+ '../../skia/skia.gyp:skia',
+ '../../testing/android/native_test.gyp:native_test_native_code',
+ '../../testing/gtest.gyp:gtest',
+ '../base/ui_base.gyp:ui_base',
+ '../gfx/gfx.gyp:gfx',
+ '../resources/ui_resources.gyp:ui_test_pak',
+ 'ui_android',
+ ],
+ 'sources': [
+ 'resources/resource_manager_unittest.cc',
+ 'run_all_unittests.cc',
+ ],
+ },
+ {
+ 'target_name': 'ui_android_unittests_apk',
+ 'type': 'none',
+ 'dependencies': [
+ 'ui_android_unittests',
+ 'ui_java',
+ ],
+ 'variables': {
+ 'test_suite_name': 'ui_android_unittests',
+ },
+ 'includes': [ '../../build/apk_test.gypi' ],
+ },
],
}
« no previous file with comments | « ui/android/run_all_unittests.cc ('k') | ui/base/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698