diff options
| author | Yaron Friedman <yfriedman@chromium.org> | 2014-10-24 11:02:52 -0700 |
|---|---|---|
| committer | Yaron Friedman <yfriedman@chromium.org> | 2014-10-24 18:03:45 +0000 |
| commit | cb4d80cfd84967203b5881219048671910dc9b28 (patch) | |
| tree | 6adf056643cf2b879478a4da13e8071c8ad055b8 /testing/gmock.gyp | |
| parent | 6aa5013ff32dae83905f9e466a1063858ae69982 (diff) | |
| download | chromium_src-cb4d80cfd84967203b5881219048671910dc9b28.zip chromium_src-cb4d80cfd84967203b5881219048671910dc9b28.tar.gz chromium_src-cb4d80cfd84967203b5881219048671910dc9b28.tar.bz2 | |
Revert "Check in executable for iOS test launcher"
> Check in executable for iOS test launcher
>
> This doesn't do anything yet, mostly adds supporting infrastructure.
>
> R=lliabraa@chromium.org, mark@chromium.org, sdefresne@chromium.org, lliabraa, mark, sdefresne
> TBR=darin
> BUG=426870
Breaks correctness of Android build:
ninja: Entering directory `out-android/Debug'
ninja: warning: multiple rules generate ../../build/android. builds involving
this target will not be correct; continuing anyway
ninja: warning: multiple rules generate
gen/enums/base_java_application_state/org/chromium/base/ApplicationState.java.
builds involving this target will not be correct; continuing anyway
ninja: warning: multiple rules generate gen/jsr_305_javalib/compile.stamp.
builds involving this target will not be correct; continuing anyway
ninja: warning: multiple rules generate gen/jsr_305_javalib/jsr_305_javalib.jar.
builds involving this target will not be correct; continuing anyway
ninja: warning: multiple rules generate lib.java/jsr_305_javalib.jar. builds
involving this target will not be correct; continuing anyway
ninja: warning: multiple rules generate gen/jsr_305_javalib/lint.stamp. builds
involving this target will not be correct; continuing anyway
ninja: warning: multiple rules generate lib.java/jsr_305_javalib.jar.TOC. builds
involving this target will not be correct; continuing anyway
ninja: warning: multiple rules generate lib.java/jsr_305_javalib.dex.jar. builds
involving this target will not be correct; continuing anyway
ninja: warning: multiple rules generate lib.java/jsr_305_javalib.dex.jar.inputs.
builds involving this target will not be correct; continuing anyway
ninja: warning: multiple rules generate
gen/enums/base_java_memory_pressure_level/org/chromium/base/MemoryPressureLevel.java.
builds involving this target will not be correct; continuing anyway
ninja: warning: multiple rules generate gen/base_java/compile.stamp. builds
involving this target will not be correct; continuing anyway
ninja: warning: multiple rules generate gen/base_java/base_java.jar. builds
involving this target will not be correct; continuing anyway
ninja: warning: multiple rules generate lib.java/base_java.jar. builds involving
this target will not be correct; continuing anyway
ninja: warning: multiple rules generate gen/base_java/lint.stamp. builds
involving this target will not be correct; continuing anyway
ninja: warning: multiple rules generate lib.java/base_java.jar.TOC. builds
involving this target will not be correct; continuing anyway
ninja: warning: multiple rules generate lib.java/base_java.dex.jar. builds
involving this target will not be correct; continuing anyway
ninja: warning: multiple rules generate lib.java/base_java.dex.jar.inputs.
builds involving this target will not be correct; continuing anyway
ninja: warning: multiple rules generate
gen/base_java_unittest_support/compile.stamp. builds involving this target will
not be correct; continuing anyway
ninja: warning: multiple rules generate
gen/base_java_unittest_support/base_java_unittest_support.jar. builds involving
this target will not be correct; continuing anyway
ninja: warning: multiple rules generate lib.java/base_java_unittest_support.jar.
builds involving this target will not be correct; continuing anyway
ninja: warning: multiple rules generate
gen/base_java_unittest_support/lint.stamp. builds involving this target will not
be correct; continuing anyway
ninja: warning: multiple rules generate
lib.java/base_java_unittest_support.jar.TOC. builds involving this target will
not be correct; continuing anyway
ninja: warning: multiple rules generate
lib.java/base_java_unittest_support.dex.jar. builds involving this target will
not be correct; continuing anyway
ninja: warning: multiple rules generate
lib.java/base_java_unittest_support.dex.jar.inputs. builds involving this target
will not be correct; continuing anyway
[2474 3248/20791] ACTION jni_generator_py_tests:
run_jni_generator_py_tests_1f564c39dcae2772599d3e8883c02764
and adds host toolset dep for Java is unintended.
R=phajdan.jr@chromium.org
Review URL: https://codereview.chromium.org/678653004
Cr-Commit-Position: refs/heads/master@{#301147}
Diffstat (limited to 'testing/gmock.gyp')
| -rw-r--r-- | testing/gmock.gyp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/testing/gmock.gyp b/testing/gmock.gyp index dbdd36c..22a1893 100644 --- a/testing/gmock.gyp +++ b/testing/gmock.gyp @@ -6,7 +6,6 @@ 'targets': [ { 'target_name': 'gmock', - 'toolsets': ['host', 'target'], 'type': 'static_library', 'dependencies': [ 'gtest.gyp:gtest', |