summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authorpkotwicz <pkotwicz@chromium.org>2015-10-29 09:19:58 -0700
committerCommit bot <commit-bot@chromium.org>2015-10-29 16:21:09 +0000
commit5d98eb9ffa726aee7605b096fe90035191a1463a (patch)
treeaf91d4b4aafcedd218a8fb63f8d9c1fa88841c72 /base
parent0c918277fcacfa99e392674b55efcef3a707b474 (diff)
downloadchromium_src-5d98eb9ffa726aee7605b096fe90035191a1463a.zip
chromium_src-5d98eb9ffa726aee7605b096fe90035191a1463a.tar.gz
chromium_src-5d98eb9ffa726aee7605b096fe90035191a1463a.tar.bz2
Enable base_perftests on Android
BUG=510485 Review URL: https://codereview.chromium.org/1422433004 Cr-Commit-Position: refs/heads/master@{#356863}
Diffstat (limited to 'base')
-rw-r--r--base/BUILD.gn2
-rw-r--r--base/base.gyp4
2 files changed, 3 insertions, 3 deletions
diff --git a/base/BUILD.gn b/base/BUILD.gn
index 3e471e3..efc3754 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -1058,7 +1058,7 @@ component("i18n") {
configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
}
-if (is_ios || is_win || (is_linux && !is_chromeos)) {
+if (is_ios || is_android || is_win || (is_linux && !is_chromeos)) {
# TODO(GYP): Figure out which of these work and are needed on other platforms.
test("base_perftests") {
sources = [
diff --git a/base/base.gyp b/base/base.gyp
index 390dd5f..2b67d07 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -1414,7 +1414,7 @@
'includes': [ '../build/jar_file_jni_generator.gypi' ],
},
{
- # TODO(GN)
+ # GN: //base:base_unittests_jni_headers
'target_name': 'base_unittests_jni_headers',
'type': 'none',
'sources': [
@@ -1592,7 +1592,7 @@
],
},
{
- # TODO(GN)
+ # GN: //base:base_perftests_apk
'target_name': 'base_perftests_apk',
'type': 'none',
'dependencies': [