diff options
author | phoglund <phoglund@chromium.org> | 2014-09-24 07:02:00 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-09-24 14:02:15 +0000 |
commit | 6e9dc50aecf078d7826fe8e4611b2c238aab3f23 (patch) | |
tree | 8ed2840f4a979de368b2dae6a4f7a188ecad8fcf /build/host_jar.gypi | |
parent | 197fa5f4d6499ab91ae2435d82dda19fd60d9271 (diff) | |
download | chromium_src-6e9dc50aecf078d7826fe8e4611b2c238aab3f23.zip chromium_src-6e9dc50aecf078d7826fe8e4611b2c238aab3f23.tar.gz chromium_src-6e9dc50aecf078d7826fe8e4611b2c238aab3f23.tar.bz2 |
Revert of Revert of [Android] JUnit runner + gyp changes. (patchset #1 id:1 of https://codereview.chromium.org/597123002/)
Reason for revert:
Didn't help. We probably got scheduled on other, flakier Android devices which caused tests to start flaking, or something else is the root cause.
Original issue's description:
> Revert of [Android] JUnit runner + gyp changes. (patchset #15 id:280001 of https://codereview.chromium.org/574433003/)
>
> Reason for revert:
> Speculative revert: Android test started flaking a ton after this landed. Affected targets androidwebview_instrumentation_tests, chromeshell_instrumentation_tests, contentshell_instrumentation_tests. This CL seems the most likely in the blamelist of https://build.chromium.org/p/chromium.linux/builders/Android%20Tests/builds/15905.
>
> Original issue's description:
> > [Android] JUnit runner + gyp changes.
> >
> > This adds Java code for running junit tests, as well as gyp targets for
> > both runnable and non-runnable host-side JARs.
> >
> > BUG=316383
> >
> > Committed: https://crrev.com/2e56d4508e33de5fc60bbbb41c5a5d5534e88174
> > Cr-Commit-Position: refs/heads/master@{#296340}
>
> TBR=cjhopman@chromium.org,nyquist@chromium.org,aurimas@chromium.org,jbudorick@chromium.org
> NOTREECHECKS=true
> NOTRY=true
> BUG=316383
>
> Committed: https://crrev.com/54b9408f8b18e3bf3a33343e375186e1949e8e86
> Cr-Commit-Position: refs/heads/master@{#296384}
TBR=cjhopman@chromium.org,nyquist@chromium.org,aurimas@chromium.org,jbudorick@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=316383
Review URL: https://codereview.chromium.org/596303002
Cr-Commit-Position: refs/heads/master@{#296406}
Diffstat (limited to 'build/host_jar.gypi')
-rw-r--r-- | build/host_jar.gypi | 102 |
1 files changed, 102 insertions, 0 deletions
diff --git a/build/host_jar.gypi b/build/host_jar.gypi new file mode 100644 index 0000000..6ccc1bd --- /dev/null +++ b/build/host_jar.gypi @@ -0,0 +1,102 @@ +# Copyright 2014 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +# This file is meant to be included into a target to provide a rule to build +# a JAR file for use on a host in a consistent manner. +# +# To use this, create a gyp target with the following form: +# { +# 'target_name': 'my_jar', +# 'type': 'none', +# 'variables': { +# 'src_paths': [ +# 'path/to/directory', +# 'path/to/other/directory', +# 'path/to/individual_file.java', +# ... +# ], +# }, +# 'includes': [ 'path/to/this/gypi/file' ], +# } +# +# Required variables: +# src_paths - A list of all paths containing java files that should be +# included in the jar. Paths can be either directories or files. +# Optional/automatic variables: +# excluded_src_paths - A list of all paths that should be excluded from +# the jar. +# generated_src_dirs - Directories containing additional .java files +# generated at build time. +# input_jars_paths - A list of paths to the jars that should be included +# in the classpath. +# main_class - The class containing the main() function that should be called +# when running the jar file. +# jar_excluded_classes - A list of .class files that should be excluded +# from the jar. + +{ + 'dependencies': [ + '<(DEPTH)/build/android/setup.gyp:build_output_dirs', + ], + 'variables': { + 'classes_dir': '<(intermediate_dir)/classes', + 'excluded_src_paths': [], + 'generated_src_dirs': [], + 'input_jars_paths': [], + 'intermediate_dir': '<(SHARED_INTERMEDIATE_DIR)/<(_target_name)', + 'jar_dir': '<(PRODUCT_DIR)/lib.java', + 'jar_excluded_classes': [], + 'jar_name': '<(_target_name).jar', + 'jar_path': '<(jar_dir)/<(jar_name)', + 'main_class%': '', + 'stamp': '<(intermediate_dir)/jar.stamp', + }, + 'all_dependent_settings': { + 'variables': { + 'input_jars_paths': ['<(jar_path)'] + }, + }, + 'actions': [ + { + 'action_name': 'javac_<(_target_name)', + 'message': 'Compiling <(_target_name) java sources', + 'variables': { + 'extra_options': [], + 'java_sources': [ '<!@(find <@(src_paths) -name "*.java")' ], + 'conditions': [ + ['"<(excluded_src_paths)" != ""', { + 'java_sources!': ['<!@(find <@(excluded_src_paths) -name "*.java")'] + }], + ['"<(jar_excluded_classes)" != ""', { + 'extra_options': ['--excluded-classes=<(jar_excluded_classes)'] + }], + ['">(main_class)" != ""', { + 'extra_options': ['--main-class=>(main_class)'] + }] + ], + }, + 'inputs': [ + '<(DEPTH)/build/android/gyp/util/build_utils.py', + '<(DEPTH)/build/android/gyp/javac.py', + '^@(java_sources)', + '>@(input_jars_paths)', + ], + 'outputs': [ + '<(jar_path)', + '<(stamp)', + ], + 'action': [ + 'python', '<(DEPTH)/build/android/gyp/javac.py', + '--classpath=>(input_jars_paths)', + '--src-gendirs=>(generated_src_dirs)', + '--chromium-code=<(chromium_code)', + '--stamp=<(stamp)', + '--jar-path=<(jar_path)', + '<@(extra_options)', + '^@(java_sources)', + ], + }, + ] +} + |