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

Side by Side Diff: ui/android/ui_android.gyp

Issue 516703002: Replaced the current WebsiteSettings dialog with a new PageInfo dialog (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added missing template files for PageInfoConnectionType enum Created 6 years, 3 months 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 unified diff | Download patch
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 14 matching lines...) Expand all
25 'sources': [ 25 'sources': [
26 'java/BitmapFormat.template', 26 'java/BitmapFormat.template',
27 ], 27 ],
28 'variables': { 28 'variables': {
29 'package_name': 'org/chromium/ui/gfx', 29 'package_name': 'org/chromium/ui/gfx',
30 'template_deps': ['../gfx/android/bitmap_config_list.h'], 30 'template_deps': ['../gfx/android/bitmap_config_list.h'],
31 }, 31 },
32 'includes': [ '../../build/android/java_cpp_template.gypi' ], 32 'includes': [ '../../build/android/java_cpp_template.gypi' ],
33 }, 33 },
34 { 34 {
35 'target_name': 'page_info_connection_type_java',
36 'type': 'none',
37 'sources': [
38 'java/PageInfoConnectionType.template',
39 ],
40 'variables': {
41 'package_name': 'org/chromium/ui/gfx',
42 'template_deps': ['../gfx/android/page_info_connection_type_list.h'],
43 },
44 'includes': [ '../../build/android/java_cpp_template.gypi' ],
45 },
46 {
35 'target_name': 'ui_java', 47 'target_name': 'ui_java',
36 'type': 'none', 48 'type': 'none',
37 'variables': { 49 'variables': {
38 'java_in_dir': '../../ui/android/java', 50 'java_in_dir': '../../ui/android/java',
39 'has_java_resources': 1, 51 'has_java_resources': 1,
40 'R_package': 'org.chromium.ui', 52 'R_package': 'org.chromium.ui',
41 'R_package_relpath': 'org/chromium/ui', 53 'R_package_relpath': 'org/chromium/ui',
42 }, 54 },
43 'dependencies': [ 55 'dependencies': [
44 '../../base/base.gyp:base_java', 56 '../../base/base.gyp:base_java',
45 'bitmap_format_java', 57 'bitmap_format_java',
58 'page_info_connection_type_java',
46 'ui_strings_grd', 59 'ui_strings_grd',
47 'window_open_disposition_java', 60 'window_open_disposition_java',
48 ], 61 ],
49 'includes': [ '../../build/java.gypi' ], 62 'includes': [ '../../build/java.gypi' ],
50 }, 63 },
51 { 64 {
52 'target_name': 'ui_strings_grd', 65 'target_name': 'ui_strings_grd',
53 # The android_webview/Android.mk file depends on this target directly. 66 # The android_webview/Android.mk file depends on this target directly.
54 'android_unmangled_name': 1, 67 'android_unmangled_name': 1,
55 'type': 'none', 68 'type': 'none',
56 'variables': { 69 'variables': {
57 'grd_file': '../../ui/android/java/strings/android_ui_strings.grd', 70 'grd_file': '../../ui/android/java/strings/android_ui_strings.grd',
58 }, 71 },
59 'includes': [ 72 'includes': [
60 '../../build/java_strings_grd.gypi', 73 '../../build/java_strings_grd.gypi',
61 ], 74 ],
62 }, 75 },
63 ], 76 ],
64 } 77 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698