From ed89e3f9e2b14b0af7abf3e5bbaa45368dff0e1f Mon Sep 17 00:00:00 2001 From: lambroslambrou Date: Thu, 15 Oct 2015 11:15:52 -0700 Subject: Android Chromoting: Clean up GYP file by merging sections. As a result of an old CL: http://crrev.com/568c12964fe00214c1e28845e806739224d43a66 the conditional of one section became identical to a previous section, so they can be merged. Review URL: https://codereview.chromium.org/1403613007 Cr-Commit-Position: refs/heads/master@{#354308} --- remoting/remoting_android.gypi | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'remoting') diff --git a/remoting/remoting_android.gypi b/remoting/remoting_android.gypi index 14ce25f..861a94b 100644 --- a/remoting/remoting_android.gypi +++ b/remoting/remoting_android.gypi @@ -134,7 +134,7 @@ }, }], ], - }, + }, # end of target 'remoting_android_client_java' { 'target_name': 'remoting_apk', 'type': 'none', @@ -168,11 +168,6 @@ }, 'includes': [ '../build/java_apk.gypi' ], }, # end of target 'remoting_test_apk' - ], # end of 'targets' - }], # 'OS=="android"' - - ['OS=="android"', { - 'targets': [ { 'target_name': 'remoting_unittests_apk', 'type': 'none', @@ -183,8 +178,8 @@ 'test_suite_name': 'remoting_unittests', }, 'includes': [ '../build/apk_test.gypi' ], - }, - ], + }, # end of target 'remoting_unittests_apk' + ], # end of 'targets' }], # 'OS=="android" ], # end of 'conditions' } -- cgit v1.1