Skip to content

Commit

Permalink
[sync] Extract Android-specific prod Java GYP-target to a separate file.
Browse files Browse the repository at this point in the history
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
  • Loading branch information
nyquist@chromium.org committed Feb 20, 2013
1 parent 4ba74d9 commit a1373b2
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 17 deletions.
4 changes: 4 additions & 0 deletions sync/OWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions sync/sync.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
},

'includes': [
'sync_android.gypi',
'sync_tests.gypi',
],

Expand Down
28 changes: 28 additions & 0 deletions sync/sync_android.gypi
Original file line number Diff line number Diff line change
@@ -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' ],
},
],
}],
],
}
17 changes: 0 additions & 17 deletions sync/sync_tests.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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"', {
Expand Down

0 comments on commit a1373b2

Please sign in to comment.