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

Side by Side Diff: chrome/chrome.gyp

Issue 11820058: Revert 176134 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 11 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 | Annotate | Revision Log
« no previous file with comments | « build/java_apk.gypi ('k') | content/content.gyp » ('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 1063 matching lines...) Expand 10 before | Expand all | Expand 10 after
1074 '../content/content.gyp:web_contents_delegate_android_java', 1074 '../content/content.gyp:web_contents_delegate_android_java',
1075 '../third_party/guava/guava.gyp:guava_javalib', 1075 '../third_party/guava/guava.gyp:guava_javalib',
1076 '../ui/ui.gyp:ui_java', 1076 '../ui/ui.gyp:ui_java',
1077 ], 1077 ],
1078 'variables': { 1078 'variables': {
1079 'package_name': 'chrome', 1079 'package_name': 'chrome',
1080 'java_in_dir': '../chrome/android/java', 1080 'java_in_dir': '../chrome/android/java',
1081 'has_java_resources': 1, 1081 'has_java_resources': 1,
1082 'R_package': 'org.chromium.chrome', 1082 'R_package': 'org.chromium.chrome',
1083 'R_package_relpath': 'org/chromium/chrome', 1083 'R_package_relpath': 'org/chromium/chrome',
1084 'java_strings_grd': 'android_chrome_strings.grd',
1085 }, 1084 },
1086 'includes': [ 1085 'includes': [
1087 '../build/java.gypi', 1086 '../build/java.gypi',
1088 ], 1087 ],
1089 }, 1088 },
1090 ], # 'targets' 1089 ], # 'targets'
1091 'includes': [ 1090 'includes': [
1092 'chrome_android.gypi', 1091 'chrome_android.gypi',
1093 ]}, # 'includes' 1092 ]}, # 'includes'
1094 ], # OS=="android" 1093 ], # OS=="android"
1095 ], # 'conditions' 1094 ], # 'conditions'
1096 } 1095 }
OLDNEW
« no previous file with comments | « build/java_apk.gypi ('k') | content/content.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698