diff options
| author | jbudorick <jbudorick@chromium.org> | 2014-10-17 03:35:42 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-17 10:36:05 +0000 |
| commit | e1adb7edbdfa6a76da39a841c8a150bc54cb78fe (patch) | |
| tree | b25b4690eb5d3d7508d4831ec220e7665fb8a94e /build/java.gypi | |
| parent | 525145e3ba9bd92130945e74211d5b24b94ef829 (diff) | |
| download | chromium_src-e1adb7edbdfa6a76da39a841c8a150bc54cb78fe.zip chromium_src-e1adb7edbdfa6a76da39a841c8a150bc54cb78fe.tar.gz chromium_src-e1adb7edbdfa6a76da39a841c8a150bc54cb78fe.tar.bz2 | |
[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}
Diffstat (limited to 'build/java.gypi')
| -rw-r--r-- | build/java.gypi | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/build/java.gypi b/build/java.gypi index bf6f56c..af0bf0e 100644 --- a/build/java.gypi +++ b/build/java.gypi @@ -19,6 +19,8 @@ # java_in_dir - The top-level java directory. The src should be in # <java_in_dir>/src. # 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 # ensure that this target is rebuilt when one of these paths changes. # additional_src_dirs - Additional directories with .java files to be compiled @@ -49,6 +51,7 @@ '<(DEPTH)/build/android/setup.gyp:build_output_dirs' ], 'variables': { + 'add_to_dependents_classpaths%': 1, 'android_jar': '<(android_sdk)/android.jar', 'input_jars_paths': [ '<(android_jar)' ], 'additional_src_dirs': [], @@ -97,15 +100,17 @@ 'emma_instrument': '<(emma_instrument)', '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': [ + ['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', { 'variables': { 'res_dir': '<(java_in_dir)/res', |