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

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

Issue 562603002: Move PageTransition from //content/public/common to //ui/base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase 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
« no previous file with comments | « ui/android/java/PageTransitionTypes.template ('k') | ui/app_list/demo/app_list_demo_views.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 {
11 'target_name': 'bitmap_format_java', 11 'target_name': 'bitmap_format_java',
12 'type': 'none', 12 'type': 'none',
13 'variables': { 13 'variables': {
14 'source_file': '../gfx/android/java_bitmap.h', 14 'source_file': '../gfx/android/java_bitmap.h',
15 }, 15 },
16 'includes': [ '../../build/android/java_cpp_enum.gypi' ], 16 'includes': [ '../../build/android/java_cpp_enum.gypi' ],
17 }, 17 },
18 { 18 {
19 'target_name': 'page_transition_types_java',
20 'type': 'none',
21 'sources': [
22 'java/PageTransitionTypes.template',
23 ],
24 'variables': {
25 'package_name': 'org/chromium/ui/base',
26 'template_deps': ['../base/page_transition_types_list.h'],
27 },
28 'includes': [ '../../build/android/java_cpp_template.gypi' ],
29 },
30 {
19 'target_name': 'window_open_disposition_java', 31 'target_name': 'window_open_disposition_java',
20 'type': 'none', 32 'type': 'none',
21 'variables': { 33 'variables': {
22 'source_file': '../base/window_open_disposition.h', 34 'source_file': '../base/window_open_disposition.h',
23 }, 35 },
24 'includes': [ '../../build/android/java_cpp_enum.gypi' ], 36 'includes': [ '../../build/android/java_cpp_enum.gypi' ],
25 }, 37 },
26 { 38 {
27 'target_name': 'ui_java', 39 'target_name': 'ui_java',
28 'type': 'none', 40 'type': 'none',
29 'variables': { 41 'variables': {
30 'java_in_dir': '../../ui/android/java', 42 'java_in_dir': '../../ui/android/java',
31 'has_java_resources': 1, 43 'has_java_resources': 1,
32 'R_package': 'org.chromium.ui', 44 'R_package': 'org.chromium.ui',
33 'R_package_relpath': 'org/chromium/ui', 45 'R_package_relpath': 'org/chromium/ui',
34 }, 46 },
35 'dependencies': [ 47 'dependencies': [
36 '../../base/base.gyp:base_java', 48 '../../base/base.gyp:base_java',
37 'bitmap_format_java', 49 'bitmap_format_java',
50 'page_transition_types_java',
38 'ui_strings_grd', 51 'ui_strings_grd',
39 'window_open_disposition_java', 52 'window_open_disposition_java',
40 ], 53 ],
41 'includes': [ '../../build/java.gypi' ], 54 'includes': [ '../../build/java.gypi' ],
42 }, 55 },
43 { 56 {
44 'target_name': 'ui_strings_grd', 57 'target_name': 'ui_strings_grd',
45 # The android_webview/Android.mk file depends on this target directly. 58 # The android_webview/Android.mk file depends on this target directly.
46 'android_unmangled_name': 1, 59 'android_unmangled_name': 1,
47 'type': 'none', 60 'type': 'none',
48 'variables': { 61 'variables': {
49 'grd_file': '../../ui/android/java/strings/android_ui_strings.grd', 62 'grd_file': '../../ui/android/java/strings/android_ui_strings.grd',
50 }, 63 },
51 'includes': [ 64 'includes': [
52 '../../build/java_strings_grd.gypi', 65 '../../build/java_strings_grd.gypi',
53 ], 66 ],
54 }, 67 },
55 ], 68 ],
56 } 69 }
OLDNEW
« no previous file with comments | « ui/android/java/PageTransitionTypes.template ('k') | ui/app_list/demo/app_list_demo_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698