summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--build/all_android.gyp4
-rw-r--r--build/apk_test.gypi1
-rw-r--r--tools/android/android_tools.gyp19
3 files changed, 21 insertions, 3 deletions
diff --git a/build/all_android.gyp b/build/all_android.gyp
index a8cb2a3..2dc133f 100644
--- a/build/all_android.gyp
+++ b/build/all_android.gyp
@@ -55,11 +55,9 @@
'../sql/sql.gyp:sql_unittests',
'../sync/sync.gyp:sync_unit_tests',
'../third_party/WebKit/Source/WebKit/chromium/All.gyp:*',
+ '../tools/android/android_tools.gyp:android_tools',
'../tools/android/device_stats_monitor/device_stats_monitor.gyp:device_stats_monitor',
- '../tools/android/fake_dns/fake_dns.gyp:fake_dns',
'../tools/android/findbugs_plugin/findbugs_plugin.gyp:findbugs_plugin_test',
- '../tools/android/forwarder2/forwarder.gyp:forwarder2',
- '../tools/android/md5sum/md5sum.gyp:md5sum',
'../ui/ui.gyp:ui_unittests',
# Required by ui_unittests.
# TODO(wangxianzhu): It'd better let ui_unittests depend on it, but
diff --git a/build/apk_test.gypi b/build/apk_test.gypi
index c09615c..1690dfcf 100644
--- a/build/apk_test.gypi
+++ b/build/apk_test.gypi
@@ -21,6 +21,7 @@
{
'dependencies': [
'<(DEPTH)/base/base.gyp:base_java',
+ '<(DEPTH)/tools/android/android_tools.gyp:android_tools',
],
'target_conditions': [
['_toolset == "target"', {
diff --git a/tools/android/android_tools.gyp b/tools/android/android_tools.gyp
new file mode 100644
index 0000000..43151a5
--- /dev/null
+++ b/tools/android/android_tools.gyp
@@ -0,0 +1,19 @@
+# Copyright (c) 2012 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.
+
+{
+ 'targets': [
+ # Intermediate target grouping the android tools needed to run native
+ # unittests apks.
+ {
+ 'target_name': 'android_tools',
+ 'type': 'none',
+ 'dependencies': [
+ 'fake_dns/fake_dns.gyp:fake_dns',
+ 'forwarder2/forwarder.gyp:forwarder2',
+ 'md5sum/md5sum.gyp:md5sum',
+ ],
+ },
+ ],
+}