diff options
| author | cjhopman <cjhopman@chromium.org> | 2014-12-09 16:01:18 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-12-10 00:01:45 +0000 |
| commit | 907644b0a7ddae52e3ef74a670df647fe61da5d9 (patch) | |
| tree | 49953d1101e3b3d217896b362c4a57543e0e14cf /build/config/android/config.gni | |
| parent | 9d1c8ff57b7042918cc5f81b2cd37d974df2e557 (diff) | |
| download | chromium_src-907644b0a7ddae52e3ef74a670df647fe61da5d9.zip chromium_src-907644b0a7ddae52e3ef74a670df647fe61da5d9.tar.gz chromium_src-907644b0a7ddae52e3ef74a670df647fe61da5d9.tar.bz2 | |
Fix some android configuration
This adds //chrome/test:test_support_unit to the root build targets for
Android. This target is used by downstream things and so adding it to
the root will ensure that it is buildable upstream. This requires making
the sync integration/performance stuff be not defined if !is_android
(since they depend on things that aren't defined on that platform).
Changes the internal configuration hooks to not require setting the sdk
information.
Makes unittest_apk actually forward datadeps.
BUG=359249
TBR=cpu
Review URL: https://codereview.chromium.org/758473002
Cr-Commit-Position: refs/heads/master@{#307589}
Diffstat (limited to 'build/config/android/config.gni')
| -rw-r--r-- | build/config/android/config.gni | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/build/config/android/config.gni b/build/config/android/config.gni index 82405dd..60934c2 100644 --- a/build/config/android/config.gni +++ b/build/config/android/config.gni @@ -12,7 +12,9 @@ if (is_android) { if (has_chrome_android_internal) { import("//clank/config.gni") - } else { + } + + if (!defined(default_android_sdk_root)) { default_android_sdk_root = "//third_party/android_tools/sdk" default_android_sdk_version = "21" default_android_sdk_build_tools_version = "21.0.1" |