Some build changes for nacl on Android

1) Use TOOLCHAIN_OS rather than OS for package names
2) gpu_nacl.gyp shouldn't include trusted code test dependencies.

BUG= https://code.google.com/p/nativeclient/issues/detail?id=3032
R=bbudge@chromium.org, bradnelson@google.com, piman@chromium.org, sievers@chromium.org

Review URL: https://codereview.chromium.org/295933013

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272345 0039d316-1c4b-4281-b951-d872f2087c98

gpu/gpu.gyp

@@ -606,6 +606,17 @@
             '../build/apk_test.gypi',
           ],
         },
+        {
+          'target_name': 'gpu_unittests_apk',
+          'type': 'none',
+          'dependencies': [
+            'gpu_unittests',
+          ],
+          'variables': {
+            'test_suite_name': 'gpu_unittests',
+          },
+          'includes': [ '../build/apk_test.gypi' ],
+        },
       ],
     }],
   ],

gpu/gpu_common.gypi

@@ -48,21 +48,4 @@
       'command_buffer/client/vertex_array_object_manager.h',
     ]
   },
-  'conditions': [
-    ['OS == "android"', {
-      'targets': [
-        {
-          'target_name': 'gpu_unittests_apk',
-          'type': 'none',
-          'dependencies': [
-            'gpu_unittests',
-          ],
-          'variables': {
-            'test_suite_name': 'gpu_unittests',
-          },
-          'includes': [ '../build/apk_test.gypi' ],
-        },
-      ],
-    }],
-  ],
 }

ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_support_extension.gyp

@@ -17,9 +17,9 @@
       'description': 'Untar pnacl_translator',
       'inputs': [
         '<(DEPTH)/native_client/build/package_version/package_version.py',
-        '<(DEPTH)/native_client/toolchain/.tars/<(OS)_x86/pnacl_translator.json',
+        '<(DEPTH)/native_client/toolchain/.tars/<(TOOLCHAIN_OS)_x86/pnacl_translator.json',
       ],
-      'outputs': ['<(SHARED_INTERMEDIATE_DIR)/<(OS)_x86/pnacl_translator/pnacl_translator.json'],
+      'outputs': ['<(SHARED_INTERMEDIATE_DIR)/<(TOOLCHAIN_OS)_x86/pnacl_translator/pnacl_translator.json'],
       'action': [
         'python',
         '<(DEPTH)/native_client/build/package_version/package_version.py',
@@ -51,7 +51,7 @@
             'inputs': [
               'pnacl_component_crx_gen.py',
               # A stamp file representing the contents of pnacl_translator.
-              '<(SHARED_INTERMEDIATE_DIR)/<(OS)_x86/pnacl_translator/pnacl_translator.json',
+              '<(SHARED_INTERMEDIATE_DIR)/<(TOOLCHAIN_OS)_x86/pnacl_translator/pnacl_translator.json',
               '<(DEPTH)/native_client/pnacl/driver/pnacl_info_template.json',
               '<(DEPTH)/native_client/toolchain_revisions/pnacl_newlib.json',
             ],
@@ -183,7 +183,7 @@
               '<@(lib_overrides)',
               '--target_arch=<(target_arch)',
               '--info_template_path=<(DEPTH)/native_client/pnacl/driver/pnacl_info_template.json',
-              '--pnacl_translator_path=<(SHARED_INTERMEDIATE_DIR)/<(OS)_x86/pnacl_translator',
+              '--pnacl_translator_path=<(SHARED_INTERMEDIATE_DIR)/<(TOOLCHAIN_OS)_x86/pnacl_translator',
               '--package_version_path=<(DEPTH)/native_client/build/package_version/package_version.py',
               '--pnacl_package_name=pnacl_newlib',
               # ABI Version Number.