diff options
| author | nyquist@chromium.org <nyquist@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-20 12:10:09 +0000 |
|---|---|---|
| committer | nyquist@chromium.org <nyquist@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-20 12:10:09 +0000 |
| commit | a1373b2d5ea9b036b1ce1cee2952cdb4347fc1d6 (patch) | |
| tree | 5913fdc96d4916a744673b0add8e8b7a06cd54cd /sync | |
| parent | 4ba74d932823f6d9f9d606d1565dafa84a91e636 (diff) | |
| download | chromium_src-a1373b2d5ea9b036b1ce1cee2952cdb4347fc1d6.zip chromium_src-a1373b2d5ea9b036b1ce1cee2952cdb4347fc1d6.tar.gz chromium_src-a1373b2d5ea9b036b1ce1cee2952cdb4347fc1d6.tar.bz2 | |
[sync] Extract Android-specific prod Java GYP-target to a separate file.
Currently, both Android Java-targets live within sync_tests.gypi. This
CL moves the prod target sync_java out to a separate file, and also adds
per-file OWNERS entries for that file, using the same owners as in
sync/android/OWNERS.
BUG=None
Review URL: https://chromiumcodereview.appspot.com/12303034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@183498 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync')
| -rw-r--r-- | sync/OWNERS | 4 | ||||
| -rw-r--r-- | sync/sync.gyp | 1 | ||||
| -rw-r--r-- | sync/sync_android.gypi | 28 | ||||
| -rw-r--r-- | sync/sync_tests.gypi | 17 |
4 files changed, 33 insertions, 17 deletions
diff --git a/sync/OWNERS b/sync/OWNERS index 033e1f6..bf2330d 100644 --- a/sync/OWNERS +++ b/sync/OWNERS @@ -6,3 +6,7 @@ rlarocque@chromium.org rsimha@chromium.org tim@chromium.org zea@chromium.org + +per-file sync_android.gypi=nileshagrawal@chromium.org +per-file sync_android.gypi=nyquist@chromium.org +per-file sync_android.gypi=yfriedman@chromium.org diff --git a/sync/sync.gyp b/sync/sync.gyp index baeffba..fb6476f 100644 --- a/sync/sync.gyp +++ b/sync/sync.gyp @@ -8,6 +8,7 @@ }, 'includes': [ + 'sync_android.gypi', 'sync_tests.gypi', ], diff --git a/sync/sync_android.gypi b/sync/sync_android.gypi new file mode 100644 index 0000000..168959a --- /dev/null +++ b/sync/sync_android.gypi @@ -0,0 +1,28 @@ +# Copyright 2013 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. + +{ + 'conditions': [ + ['OS == "android"', { + 'targets': [ + { + 'target_name': 'sync_java', + 'type': 'none', + 'variables': { + 'package_name': 'sync', + 'java_in_dir': '../sync/android/java', + }, + 'dependencies': [ + '../base/base.gyp:base_java', + '../net/net.gyp:net_java', + '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_javalib', + '../third_party/guava/guava.gyp:guava_javalib', + '../third_party/jsr-305/jsr-305.gyp:jsr_305_javalib', + ], + 'includes': [ '../build/java.gypi' ], + }, + ], + }], + ], +} diff --git a/sync/sync_tests.gypi b/sync/sync_tests.gypi index 3936274..dfef680 100644 --- a/sync/sync_tests.gypi +++ b/sync/sync_tests.gypi @@ -565,22 +565,6 @@ ['OS == "android"', { 'targets': [ { - 'target_name': 'sync_java', - 'type': 'none', - 'variables': { - 'package_name': 'sync', - 'java_in_dir': '../sync/android/java', - }, - 'dependencies': [ - '../base/base.gyp:base_java', - '../net/net.gyp:net_java', - '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_javalib', - '../third_party/guava/guava.gyp:guava_javalib', - '../third_party/jsr-305/jsr-305.gyp:jsr_305_javalib', - ], - 'includes': [ '../build/java.gypi' ], - }, - { 'target_name': 'sync_javatests', 'type': 'none', 'variables': { @@ -595,7 +579,6 @@ }, ], }], - # Special target to wrap a gtest_target_type==shared_library # sync_unit_tests into an android apk for execution. ['OS == "android" and gtest_target_type == "shared_library"', { |