diff options
| author | cjhopman <cjhopman@chromium.org> | 2014-10-23 20:50:45 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-24 03:51:23 +0000 |
| commit | ca675d3ec565477b2e3bae8b0709a412d029fa21 (patch) | |
| tree | b8792a01e624fdecc977e9276e705990a3377296 /testing | |
| parent | 7ec86e83523b60bab33f1739469ff0a0801c8eb4 (diff) | |
| download | chromium_src-ca675d3ec565477b2e3bae8b0709a412d029fa21.zip chromium_src-ca675d3ec565477b2e3bae8b0709a412d029fa21.tar.gz chromium_src-ca675d3ec565477b2e3bae8b0709a412d029fa21.tar.bz2 | |
GN: Some small changes to support chrome android internal stuff
This actually hooks up (i.e. passes from invoker) several variables
controlling apk creation (version name, version code,
use_relocation_packer, use_chromium_linker, unzip_libraries_from_apk).
Adds support for overriding some configuration in the private repo.
Adds support for public_configs in grit_rule.gni.
Adds some junit targets (these are built as android libraries currently
instead of host libraries, but that just means we do a bit extra work
that we don't really need).
BUG=359249
Review URL: https://codereview.chromium.org/659703002
Cr-Commit-Position: refs/heads/master@{#301039}
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/android/junit/BUILD.gn | 27 | ||||
| -rw-r--r-- | testing/android/junit/junit_test.gyp | 2 |
2 files changed, 29 insertions, 0 deletions
diff --git a/testing/android/junit/BUILD.gn b/testing/android/junit/BUILD.gn new file mode 100644 index 0000000..bd8b517 --- /dev/null +++ b/testing/android/junit/BUILD.gn @@ -0,0 +1,27 @@ +# 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. + +assert(is_android) + +import("//build/config/android/rules.gni") + +# TODO(GYP): should be java_library +# GYP: //testing/android/junit_test.gyp:junit_test_support +android_library("junit_test_support") { + DEPRECATED_java_in_dir = "java/src" + deps = [ + "//third_party/junit" + ] +} + +# TODO(GYP): should be java_library +# GYP: //testing/android/junit_test.gyp:junit_unit_tests +android_library("junit_unittests") { + deps = [ + ":junit_test_support", + "//third_party/junit", + ] +#main_class = "org.chromium.testing.local.JuniTestMain" + DEPRECATED_java_in_dir = "javatests/src" +} diff --git a/testing/android/junit/junit_test.gyp b/testing/android/junit/junit_test.gyp index 35b3be4..8e726a9 100644 --- a/testing/android/junit/junit_test.gyp +++ b/testing/android/junit/junit_test.gyp @@ -5,6 +5,7 @@ { 'targets': [ { + # GN: //testing/android/junit:junit_test_support 'target_name': 'junit_test_support', 'type': 'none', 'dependencies': [ @@ -20,6 +21,7 @@ ], }, { + # GN: //testing/android/junit:junit_unittests 'target_name': 'junit_unit_tests', 'type': 'none', 'dependencies': [ |