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

Side by Side Diff: build/java.gypi

Issue 10986094: Make java.gypi use all_dependent_settings for input_jars_paths (Closed) Base URL: http://git.chromium.org/chromium/src.git@apk_combine
Patch Set: Created 8 years, 2 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 | « base/base.gyp ('k') | chrome/chrome.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 # This file is meant to be included into a target to provide a rule 5 # This file is meant to be included into a target to provide a rule
6 # to build Java in a consistent manner. 6 # to build Java in a consistent manner.
7 # 7 #
8 # To use this, create a gyp target with the following form: 8 # To use this, create a gyp target with the following form:
9 # { 9 # {
10 # 'target_name': 'my-package_java', 10 # 'target_name': 'my-package_java',
(...skipping 21 matching lines...) Expand all
32 # that are generated at build time. This should be set automatically by a 32 # that are generated at build time. This should be set automatically by a
33 # target's dependencies. The .java files in these directories are not 33 # target's dependencies. The .java files in these directories are not
34 # included in the 'inputs' list (unlike additional_src_dirs). 34 # included in the 'inputs' list (unlike additional_src_dirs).
35 # input_jars_paths - The path to jars to be included in the classpath. This 35 # input_jars_paths - The path to jars to be included in the classpath. This
36 # should be filled automatically by depending on the appropriate targets. 36 # should be filled automatically by depending on the appropriate targets.
37 37
38 { 38 {
39 'dependencies': [ 39 'dependencies': [
40 '<(DEPTH)/build/build_output_dirs_android.gyp:build_output_dirs' 40 '<(DEPTH)/build/build_output_dirs_android.gyp:build_output_dirs'
41 ], 41 ],
42 'direct_dependent_settings': { 42 # This all_dependent_settings is used for java targets only. This will add the
43 # chromium_<(package_name) jar to the classpath of dependent java targets.
44 'all_dependent_settings': {
43 'variables': { 45 'variables': {
44 'input_jars_paths': ['<(PRODUCT_DIR)/lib.java/chromium_<(package_name).jar '], 46 'input_jars_paths': ['<(PRODUCT_DIR)/lib.java/chromium_<(package_name).jar '],
45 }, 47 },
46 }, 48 },
47 'variables': { 49 'variables': {
48 'input_jars_paths': [], 50 'input_jars_paths': [],
49 'additional_src_dirs': [], 51 'additional_src_dirs': [],
50 'additional_input_paths': [], 52 'additional_input_paths': [],
51 'generated_src_dirs': [], 53 'generated_src_dirs': [],
52 }, 54 },
(...skipping 26 matching lines...) Expand all
79 '-DINPUT_JARS_PATHS=>(input_jars_paths)', 81 '-DINPUT_JARS_PATHS=>(input_jars_paths)',
80 '-DPACKAGE_NAME=<(package_name)', 82 '-DPACKAGE_NAME=<(package_name)',
81 83
82 '-Dbasedir=<(java_in_dir)', 84 '-Dbasedir=<(java_in_dir)',
83 '-buildfile', 85 '-buildfile',
84 '<(DEPTH)/build/android/ant/chromium-jars.xml' 86 '<(DEPTH)/build/android/ant/chromium-jars.xml'
85 ] 87 ]
86 }, 88 },
87 ], 89 ],
88 } 90 }
OLDNEW
« no previous file with comments | « base/base.gyp ('k') | chrome/chrome.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698