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

Side by Side Diff: ui/shell_dialogs/shell_dialogs.gyp

Issue 70843003: ui: Android changes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: dom_distiller fixes Created 7 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/gl/gl.gyp ('k') | ui/test/test_suite.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 {
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 '../aura/aura.gyp:aura', 57 '../aura/aura.gyp:aura',
58 ], 58 ],
59 'sources/': [ 59 'sources/': [
60 ['exclude', 'select_file_dialog_mac.mm'], 60 ['exclude', 'select_file_dialog_mac.mm'],
61 ], 61 ],
62 } 62 }
63 ], 63 ],
64 ['OS=="android"', 64 ['OS=="android"',
65 { 65 {
66 'dependencies': [ 66 'dependencies': [
67 '../ui.gyp:ui_jni_headers', 67 '../ui.gyp:ui_base_jni_headers',
68 ], 68 ],
69 'include_dirs': [ 69 'include_dirs': [
70 '<(SHARED_INTERMEDIATE_DIR)/ui', 70 '<(SHARED_INTERMEDIATE_DIR)/ui',
71 ], 71 ],
72 'link_settings': { 72 'link_settings': {
73 'libraries': [ 73 'libraries': [
74 '-ljnigraphics', 74 '-ljnigraphics',
75 ], 75 ],
76 }, 76 },
77 } 77 }
78 ], 78 ],
79 ['OS=="android" and android_webview_build==0', 79 ['OS=="android" and android_webview_build==0',
80 { 80 {
81 'dependencies': [ 81 'dependencies': [
82 '../ui.gyp:ui_java', 82 '../android/ui_android.gyp:ui_java',
83 ], 83 ],
84 } 84 }
85 ], 85 ],
86 ], 86 ],
87 }, # target_name: shell_dialogs 87 }, # target_name: shell_dialogs
88 ], 88 ],
89 } 89 }
OLDNEW
« no previous file with comments | « ui/gl/gl.gyp ('k') | ui/test/test_suite.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698