Make NaCl IPC-based PPAPI proxy build on ARM.

base/base_untrusted.gyp

 # Copyright (c) 2012 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'includes': [
-    '../native_client/build/untrusted.gypi',
+    '../build/common_untrusted.gypi',
     'base.gypi',
   ],
   'conditions': [
     ['disable_nacl==0 and disable_nacl_untrusted==0', {
       'targets': [
         {
           'target_name': 'base_untrusted',
           'type': 'none',
           'variables': {
             'base_target': 1,
             'nacl_untrusted_build': 1,
             'nlib_target': 'libbase_untrusted.a',
             'build_glibc': 1,
             'build_newlib': 1,
             'sources': [
-              'atomicops_internals_x86_gcc.cc',
               'string16.cc',
               'sync_socket_nacl.cc',
               'third_party/nspr/prtime.cc',
               'time_posix.cc',
             ],
           },
+          'conditions': [
+            # This is needed for third_party/nspr/prtime.cc
+            ['target_arch=="arm"', {
+              'defines': [
+                '__arm__',

[DaleCurtis, 2012/08/23 19:16:40]

Since my patch to switch this out for __ARMEL__ failed for the same reason as
without this, I suspect __ARMEL__ isn't defined either.  So you might consider
adding __ARMEL__ too for everything in base that depends on build/build_config.h
(lots).

http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=cros_tegra...

[bbudge, 2012/08/23 20:32:30]

Done. I'm adding it to common_untrusted.gypi so it's defined for every target.

[DaleCurtis, 2012/08/23 20:38:58]

It looks like there are #if checks inside the NaCl code base that use __arm__
too, should this also be in common?

https://cs.corp.google.com/#search/&q=package:%5Echrome$%20__arm__%20native_c...

[bbudge, 2012/08/23 21:16:37]

I do see one untrusted (header) file that uses it, so I suppose we should. Done.

+              ],
+            }],
+          ],
           'dependencies': [
             '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
           ],
         },
       ],
     }],
   ],
 }