Commit e1adb7ed authored by jbudorick's avatar jbudorick Committed by Commit bot

[Android] Don't let chromium_commands modify all_dependent_settings via java.gypi

BUG=423025

Review URL: https://codereview.chromium.org/656803002

Cr-Commit-Position: refs/heads/master@{#300086}
parent 525145e3
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
'target_name': 'chromium_commands', 'target_name': 'chromium_commands',
'type': 'none', 'type': 'none',
'variables': { 'variables': {
'add_to_dependents_classpaths': 0,
'java_in_dir': ['java'], 'java_in_dir': ['java'],
}, },
'includes': [ 'includes': [
......
...@@ -19,6 +19,8 @@ ...@@ -19,6 +19,8 @@
# java_in_dir - The top-level java directory. The src should be in # java_in_dir - The top-level java directory. The src should be in
# <java_in_dir>/src. # <java_in_dir>/src.
# Optional/automatic variables: # Optional/automatic variables:
# add_to_dependents_classpaths - Set to 0 if the resulting jar file should not
# be added to its dependents' classpaths.
# additional_input_paths - These paths will be included in the 'inputs' list to # additional_input_paths - These paths will be included in the 'inputs' list to
# ensure that this target is rebuilt when one of these paths changes. # ensure that this target is rebuilt when one of these paths changes.
# additional_src_dirs - Additional directories with .java files to be compiled # additional_src_dirs - Additional directories with .java files to be compiled
...@@ -49,6 +51,7 @@ ...@@ -49,6 +51,7 @@
'<(DEPTH)/build/android/setup.gyp:build_output_dirs' '<(DEPTH)/build/android/setup.gyp:build_output_dirs'
], ],
'variables': { 'variables': {
'add_to_dependents_classpaths%': 1,
'android_jar': '<(android_sdk)/android.jar', 'android_jar': '<(android_sdk)/android.jar',
'input_jars_paths': [ '<(android_jar)' ], 'input_jars_paths': [ '<(android_jar)' ],
'additional_src_dirs': [], 'additional_src_dirs': [],
...@@ -97,15 +100,17 @@ ...@@ -97,15 +100,17 @@
'emma_instrument': '<(emma_instrument)', 'emma_instrument': '<(emma_instrument)',
'javac_jar_path': '<(javac_jar_path)', 'javac_jar_path': '<(javac_jar_path)',
}, },
# This all_dependent_settings is used for java targets only. This will add the
# jar path to the classpath of dependent java targets.
'all_dependent_settings': {
'variables': {
'input_jars_paths': ['<(jar_final_path)'],
'library_dexed_jars_paths': ['<(dex_path)'],
},
},
'conditions': [ 'conditions': [
['add_to_dependents_classpaths == 1', {
# This all_dependent_settings is used for java targets only. This will add the
# jar path to the classpath of dependent java targets.
'all_dependent_settings': {
'variables': {
'input_jars_paths': ['<(jar_final_path)'],
'library_dexed_jars_paths': ['<(dex_path)'],
},
},
}],
['has_java_resources == 1', { ['has_java_resources == 1', {
'variables': { 'variables': {
'res_dir': '<(java_in_dir)/res', 'res_dir': '<(java_in_dir)/res',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment