diff options
| author | cjhopman <cjhopman@chromium.org> | 2014-11-21 16:10:46 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-11-22 00:11:16 +0000 |
| commit | 7aac92d873502f8a9676bf6b3a95cdfa8cce82c5 (patch) | |
| tree | 1efc35663fd1a26ec4c7b4cd394090e07794e91b /third_party/libaddressinput/BUILD.gn | |
| parent | 9d51ce79eddc3ccf343248d4f34924de227ad3d5 (diff) | |
| download | chromium_src-7aac92d873502f8a9676bf6b3a95cdfa8cce82c5.zip chromium_src-7aac92d873502f8a9676bf6b3a95cdfa8cce82c5.tar.gz chromium_src-7aac92d873502f8a9676bf6b3a95cdfa8cce82c5.tar.bz2 | |
Add bypass_platform_checks option to java_library/binary
This allows a target to disable checks that prevent a java library from
depending on an android_library. This is required for the current way
that we build java unittests.
Also, remove provides_android_platform option. This was planned to
support unit tests, but it doesn't really work (at the top-level we want
to depend on both targets that require Android and ones that don't
support Android).
Also fixes some minor target definition issues.
TBR=cpu
BUG=359249
Review URL: https://codereview.chromium.org/739383004
Cr-Commit-Position: refs/heads/master@{#305326}
Diffstat (limited to 'third_party/libaddressinput/BUILD.gn')
| -rw-r--r-- | third_party/libaddressinput/BUILD.gn | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/third_party/libaddressinput/BUILD.gn b/third_party/libaddressinput/BUILD.gn index 6f5d903..8e65d69 100644 --- a/third_party/libaddressinput/BUILD.gn +++ b/third_party/libaddressinput/BUILD.gn @@ -180,6 +180,9 @@ if (is_android) { } android_resources("android_addressinput_widget_resources") { + deps = [ + ":libaddressinput_android_strings_grd", + ] custom_package = "com.android.i18n.addressinput" resource_dirs = [ "src/java/res" ] v14_verify_only = true @@ -190,7 +193,6 @@ if (is_android) { DEPRECATED_java_in_dir = "src/java/src" deps = [ ":android_addressinput_widget_resources", - ":libaddressinput_android_strings_grd", ] } } else { |