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

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

Issue 736163002: Upstream SpanApplier.java and SpanApplierTest.java (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: minor tweaks to SpanApplier upstream 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 unified diff | Download patch
« no previous file with comments | « ui/android/javatests/src/org/chromium/ui/text/SpanApplierTest.java ('k') | no next file » | 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 {
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 '../../base/base.gyp:base_java', 52 '../../base/base.gyp:base_java',
53 'bitmap_format_java', 53 'bitmap_format_java',
54 'page_transition_types_java', 54 'page_transition_types_java',
55 'system_ui_resource_type_java', 55 'system_ui_resource_type_java',
56 'ui_strings_grd', 56 'ui_strings_grd',
57 'window_open_disposition_java', 57 'window_open_disposition_java',
58 ], 58 ],
59 'includes': [ '../../build/java.gypi' ], 59 'includes': [ '../../build/java.gypi' ],
60 }, 60 },
61 { 61 {
62 'target_name': 'ui_javatests',
63 'type': 'none',
64 'variables': {
65 'java_in_dir': '../../ui/android/javatests',
66 },
67 'dependencies': [
68 '../../base/base.gyp:base_java_test_support',
69 'ui_java',
70 ],
71 'includes': [ '../../build/java.gypi' ],
72 },
73 {
62 'target_name': 'ui_strings_grd', 74 'target_name': 'ui_strings_grd',
63 # The android_webview/Android.mk file depends on this target directly. 75 # The android_webview/Android.mk file depends on this target directly.
64 'android_unmangled_name': 1, 76 'android_unmangled_name': 1,
65 'type': 'none', 77 'type': 'none',
66 'variables': { 78 'variables': {
67 'grd_file': '../../ui/android/java/strings/android_ui_strings.grd', 79 'grd_file': '../../ui/android/java/strings/android_ui_strings.grd',
68 }, 80 },
69 'includes': [ 81 'includes': [
70 '../../build/java_strings_grd.gypi', 82 '../../build/java_strings_grd.gypi',
71 ], 83 ],
72 }, 84 },
73 ], 85 ],
74 } 86 }
OLDNEW
« no previous file with comments | « ui/android/javatests/src/org/chromium/ui/text/SpanApplierTest.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698