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

Side by Side Diff: chrome/chrome.gyp

Issue 11363150: Support Java resources within content and chrome (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 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 | « chrome/android/java/res/values/strings.xml ('k') | chrome/chrome_tests.gypi » ('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 (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 'variables': { 5 'variables': {
6 'chromium_code': 1, 6 'chromium_code': 1,
7 7
8 # Define the common dependencies that contain all the actual 8 # Define the common dependencies that contain all the actual
9 # Chromium functionality. This list gets pulled in below by 9 # Chromium functionality. This list gets pulled in below by
10 # the link of the actual chrome (or chromium) executable on 10 # the link of the actual chrome (or chromium) executable on
(...skipping 1053 matching lines...) Expand 10 before | Expand all | Expand 10 after
1064 'dependencies': [ 1064 'dependencies': [
1065 '../base/base.gyp:base', 1065 '../base/base.gyp:base',
1066 '../content/content.gyp:content_java', 1066 '../content/content.gyp:content_java',
1067 '../content/content.gyp:navigation_interception_java', 1067 '../content/content.gyp:navigation_interception_java',
1068 '../content/content.gyp:web_contents_delegate_android_java', 1068 '../content/content.gyp:web_contents_delegate_android_java',
1069 '../ui/ui.gyp:ui_java', 1069 '../ui/ui.gyp:ui_java',
1070 ], 1070 ],
1071 'variables': { 1071 'variables': {
1072 'package_name': 'chrome', 1072 'package_name': 'chrome',
1073 'java_in_dir': '../chrome/android/java', 1073 'java_in_dir': '../chrome/android/java',
1074 'has_java_resources': 1,
1075 'R_package': 'org.chromium.chrome',
1076 'R_package_relpath': 'org/chromium/chrome',
1074 }, 1077 },
1075 'includes': [ 1078 'includes': [
1076 '../build/java.gypi', 1079 '../build/java.gypi',
1077 ], 1080 ],
1078 }, 1081 },
1079 ], # 'targets' 1082 ], # 'targets'
1080 'includes': [ 1083 'includes': [
1081 'chrome_android.gypi', 1084 'chrome_android.gypi',
1082 ]}, # 'includes' 1085 ]}, # 'includes'
1083 ], # OS=="android" 1086 ], # OS=="android"
1084 ], # 'conditions' 1087 ], # 'conditions'
1085 } 1088 }
OLDNEW
« no previous file with comments | « chrome/android/java/res/values/strings.xml ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698