diff --git a/sync/OWNERS b/sync/OWNERS index 033e1f6964a62a..bf2330d51a3dd2 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 baeffbac4f29b1..fb6476f8e0bd49 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 00000000000000..168959a62bb42e --- /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 39362747638df1..dfef68026c1910 100644 --- a/sync/sync_tests.gypi +++ b/sync/sync_tests.gypi @@ -564,22 +564,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', @@ -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"', {