diff options
author | Brett Wilson <brettw@chromium.org> | 2014-08-26 10:39:58 -0700 |
---|---|---|
committer | Brett Wilson <brettw@chromium.org> | 2014-08-26 17:40:51 +0000 |
commit | d40ebfebd18d8fc41a0f5af61d28b6c252b66bea (patch) | |
tree | 52b6393c4c405fcfe33ab97e493f87dc9b8e768e /components/variations/BUILD.gn | |
parent | 5f35ed44b90c99e00eb67f1a5fea4f81a78269fc (diff) | |
download | chromium_src-d40ebfebd18d8fc41a0f5af61d28b6c252b66bea.zip chromium_src-d40ebfebd18d8fc41a0f5af61d28b6c252b66bea.tar.gz chromium_src-d40ebfebd18d8fc41a0f5af61d28b6c252b66bea.tar.bz2 |
Fix GN toolchains to use proper out dir.
Previously it put all toolchains' main link output into the root build directory, which doesn't work when there are multiple toolchains generating the same targets.
BUG=405686
R=jamesr@chromium.org
Review URL: https://codereview.chromium.org/502163002
Cr-Commit-Position: refs/heads/master@{#291927}
Diffstat (limited to 'components/variations/BUILD.gn')
-rw-r--r-- | components/variations/BUILD.gn | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/components/variations/BUILD.gn b/components/variations/BUILD.gn index 53384c3..da9ef09 100644 --- a/components/variations/BUILD.gn +++ b/components/variations/BUILD.gn @@ -2,6 +2,10 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +if (is_android) { + import("//build/config/android/rules.gni") +} + static_library("variations") { sources = [ "active_field_trials.cc", @@ -41,4 +45,17 @@ static_library("variations") { "//components/variations/proto", "//third_party/mt19937ar", ] + + if (is_android) { + deps += [ ":jni" ] + } +} + +if (is_android) { + generate_jni("jni") { + sources = [ + "android/java/src/org/chromium/components/variations/VariationsAssociatedData.java", + ] + jni_package = "variations" + } } |