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

Side by Side Diff: content/content.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 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
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 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, # Use higher warning level. 7 'chromium_code': 1, # Use higher warning level.
8 'directxsdk_exists': '<!(python <(DEPTH)/build/dir_exists.py ../third_party/ directxsdk)', 8 'directxsdk_exists': '<!(python <(DEPTH)/build/dir_exists.py ../third_party/ directxsdk)',
9 'conditions': [ 9 'conditions': [
10 ['inside_chromium_build==0', { 10 ['inside_chromium_build==0', {
(...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after
260 'dependencies': ['content'], 260 'dependencies': ['content'],
261 }, 261 },
262 ], 262 ],
263 }], 263 }],
264 ['OS == "android"', { 264 ['OS == "android"', {
265 'targets': [ 265 'targets': [
266 { 266 {
267 'target_name': 'common_aidl', 267 'target_name': 'common_aidl',
268 'type': 'none', 268 'type': 'none',
269 'variables': { 269 'variables': {
270 'package_name': 'content',
271 'aidl_interface_file': 'public/android/java/src/org/chromium/content /common/common.aidl', 270 'aidl_interface_file': 'public/android/java/src/org/chromium/content /common/common.aidl',
272 }, 271 },
273 'sources': [ 272 'sources': [
274 'public/android/java/src/org/chromium/content/common/ISandboxedProce ssCallback.aidl', 273 'public/android/java/src/org/chromium/content/common/ISandboxedProce ssCallback.aidl',
275 'public/android/java/src/org/chromium/content/common/ISandboxedProce ssService.aidl', 274 'public/android/java/src/org/chromium/content/common/ISandboxedProce ssService.aidl',
276 ], 275 ],
277 'includes': [ '../build/java_aidl.gypi' ], 276 'includes': [ '../build/java_aidl.gypi' ],
278 }, 277 },
279 { 278 {
280 'target_name': 'content_java', 279 'target_name': 'content_java',
281 'type': 'none', 280 'type': 'none',
282 'dependencies': [ 281 'dependencies': [
283 '../base/base.gyp:base', 282 '../base/base.gyp:base',
284 '../net/net.gyp:net', 283 '../net/net.gyp:net',
285 '../ui/ui.gyp:ui_java', 284 '../ui/ui.gyp:ui_java',
286 'common_aidl', 285 'common_aidl',
287 'content_common', 286 'content_common',
288 ], 287 ],
289 'variables': { 288 'variables': {
290 'package_name': 'content',
291 'java_in_dir': '../content/public/android/java', 289 'java_in_dir': '../content/public/android/java',
292 }, 290 },
293 'includes': [ '../build/java.gypi' ], 291 'includes': [ '../build/java.gypi' ],
294 }, 292 },
295 { 293 {
296 'target_name': 'surface_texture_jni_headers', 294 'target_name': 'surface_texture_jni_headers',
297 'type': 'none', 295 'type': 'none',
298 'variables': { 296 'variables': {
299 'jni_gen_dir': 'content', 297 'jni_gen_dir': 'content',
300 'input_java_class': 'android/graphics/SurfaceTexture.class', 298 'input_java_class': 'android/graphics/SurfaceTexture.class',
(...skipping 17 matching lines...) Expand all
318 'dependencies': [ 316 'dependencies': [
319 'surface_texture_jni_headers', 317 'surface_texture_jni_headers',
320 'surface_jni_headers', 318 'surface_jni_headers',
321 ], 319 ],
322 'includes': [ 'content_jni.gypi' ], 320 'includes': [ 'content_jni.gypi' ],
323 }, 321 },
324 ], 322 ],
325 }], # OS == "android" 323 }], # OS == "android"
326 ], 324 ],
327 } 325 }
OLDNEW
« build/java.gypi ('K') | « chrome/chrome_tests.gypi ('k') | content/content_shell.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698