[remoting android] Trim Cardboard library from APK.

remoting/remoting_android.gypi

 # Copyright 2014 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"', {
       'variables': {
         # These hooks allow official builds to modify the remoting_apk target:
         # Official build of remoting_apk pulls in extra code.
@@ skipping 168 matching lines @@
             '<@(remoting_apk_extra_dependencies)',
           ],
           'variables': {
             'apk_name': 'Chromoting',
             'android_manifest_path': '<(SHARED_INTERMEDIATE_DIR)/remoting/android/AndroidManifest.xml',
             'java_in_dir': '<(remoting_apk_java_in_dir)',
             'native_lib_target': 'libremoting_client_jni',
           },
           'includes': [ '../build/java_apk.gypi' ],
           'conditions': [
-            ['target_arch == "arm"', {
+            ['enable_cardboard == 1 and target_arch == "arm"', {
               'dependencies': [ 'remoting_cardboard_extract_native_lib' ],
               'variables': {
                 'extra_native_libs': [ '<(SHARED_LIB_DIR)/libvrtoolkit.so' ],
               },
             }],
           ],
         },  # end of target 'remoting_apk'
         {
           'target_name': 'remoting_test_apk_manifest',
           'type': 'none',
@@ skipping 43 matching lines @@
           ],
           'variables': {
             'test_suite_name': 'remoting_unittests',
           },
           'includes': [ '../build/apk_test.gypi' ],
         },  # end of target 'remoting_unittests_apk'
       ],  # end of 'targets'
     }],  # 'OS=="android"
   ],  # end of 'conditions'
 }