diff options
| author | danakj <danakj@chromium.org> | 2015-12-15 12:15:09 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-15 20:16:01 +0000 |
| commit | eb58d9c805c50f85e4a04258523cf49e5c7cc5bb (patch) | |
| tree | 0930e6421e52b61b7acd8d2fe8a2bf8442f9b5f5 /base/base.gyp | |
| parent | cdc7be3643c0b0a820a8e811d6234563b0c1580d (diff) | |
| download | chromium_src-eb58d9c805c50f85e4a04258523cf49e5c7cc5bb.zip chromium_src-eb58d9c805c50f85e4a04258523cf49e5c7cc5bb.tar.gz chromium_src-eb58d9c805c50f85e4a04258523cf49e5c7cc5bb.tar.bz2 | |
Revert of [Android] Add ChromiumNetTestSupport.apk for the java EmbeddedTestServer. (patchset #13 id:240001 of https://codereview.chromium.org/1465383003/ )
Reason for revert:
Android compile failing with related error: https://code.google.com/p/chromium/issues/detail?id=569991
Original issue's description:
> [Android] Add ChromiumNetTestSupport.apk for the java EmbeddedTestServer.
>
> BUG=488195
>
> Committed: https://crrev.com/06215e9286247b08ff6c958f725c6e5185c4acd1
> Cr-Commit-Position: refs/heads/master@{#365254}
TBR=tedchoc@chromium.org,yfriedman@chromium.org,agrieve@chromium.org,mef@chromium.org,thakis@chromium.org,jbudorick@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=488195
Review URL: https://codereview.chromium.org/1526183002
Cr-Commit-Position: refs/heads/master@{#365309}
Diffstat (limited to 'base/base.gyp')
| -rw-r--r-- | base/base.gyp | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/base/base.gyp b/base/base.gyp index c31b93d..7e42ac8 100644 --- a/base/base.gyp +++ b/base/base.gyp @@ -1496,19 +1496,6 @@ 'includes': ['../build/android/java_cpp_template.gypi'], }, { - # GN: //base:base_native_test_libraries_gen - 'target_name': 'base_native_test_libraries_gen', - 'type': 'none', - 'sources': [ - 'test/android/java/templates/NativeTestLibraries.template', - ], - 'variables': { - 'package_name': 'org/chromium/base/test/library_loader', - 'template_deps': [], - }, - 'includes': [ '../build/android/java_cpp_template.gypi' ], - }, - { # GN: //base:base_android_java_enums_srcjar 'target_name': 'base_java_library_process_type', 'type': 'none', @@ -1582,11 +1569,9 @@ 'type': 'none', 'dependencies': [ 'base_java', - 'base_native_test_libraries_gen', '../testing/android/on_device_instrumentation.gyp:reporter_java', ], 'variables': { - 'jar_excluded_classes': [ '*/NativeTestLibraries.class' ], 'java_in_dir': '../base/test/android/javatests', }, 'includes': [ '../build/java.gypi' ], |