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

Side by Side Diff: chrome/chrome.gyp

Issue 11308030: Use _target_name instead of package_name for java*.gypi (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@apk_jar
Patch Set: Created 7 years, 10 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 | « build/protoc_java.gypi ('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 1069 matching lines...) Expand 10 before | Expand all | Expand 10 after
1080 'dependencies': [ 1080 'dependencies': [
1081 '../base/base.gyp:base', 1081 '../base/base.gyp:base',
1082 '../components/components.gyp:navigation_interception_java', 1082 '../components/components.gyp:navigation_interception_java',
1083 '../components/components.gyp:web_contents_delegate_android_java', 1083 '../components/components.gyp:web_contents_delegate_android_java',
1084 '../content/content.gyp:content_java', 1084 '../content/content.gyp:content_java',
1085 '../sync/sync.gyp:sync_java', 1085 '../sync/sync.gyp:sync_java',
1086 '../third_party/guava/guava.gyp:guava_javalib', 1086 '../third_party/guava/guava.gyp:guava_javalib',
1087 '../ui/ui.gyp:ui_java', 1087 '../ui/ui.gyp:ui_java',
1088 ], 1088 ],
1089 'variables': { 1089 'variables': {
1090 'package_name': 'chrome',
1091 'java_in_dir': '../chrome/android/java', 1090 'java_in_dir': '../chrome/android/java',
1092 'has_java_resources': 1, 1091 'has_java_resources': 1,
1093 'R_package': 'org.chromium.chrome', 1092 'R_package': 'org.chromium.chrome',
1094 'R_package_relpath': 'org/chromium/chrome', 1093 'R_package_relpath': 'org/chromium/chrome',
1095 'java_strings_grd': 'android_chrome_strings.grd', 1094 'java_strings_grd': 'android_chrome_strings.grd',
1096 }, 1095 },
1097 'includes': [ 1096 'includes': [
1098 '../build/java.gypi', 1097 '../build/java.gypi',
1099 ], 1098 ],
1100 }, 1099 },
1101 ], # 'targets' 1100 ], # 'targets'
1102 'includes': [ 1101 'includes': [
1103 'chrome_android.gypi', 1102 'chrome_android.gypi',
1104 ]}, # 'includes' 1103 ]}, # 'includes'
1105 ], # OS=="android" 1104 ], # OS=="android"
1106 ], # 'conditions' 1105 ], # 'conditions'
1107 } 1106 }
OLDNEW
« no previous file with comments | « build/protoc_java.gypi ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698