Add Linux Host builds to NaCl SDK

native_client_sdk/src/build_tools/make_rules.py

Index: native_client_sdk/src/build_tools/make_rules.py
===================================================================
--- native_client_sdk/src/build_tools/make_rules.py	(revision 151748)
+++ native_client_sdk/src/build_tools/make_rules.py	(working copy)
@@ -109,11 +109,6 @@
   'Release': '<TAB>$(<LINK>) /DLL /OUT:$@ $(<PROJ>_LDFLAGS) /LIBPATH:$(NACL_SDK_ROOT)/lib/win_x86_32_host/Release $^ <LIBLIST> $(WIN_LDFLAGS)'
 }
 
-WIN_LAUNCH_RULES = """
-HOST_ARGS:=--register-pepper-plugins=$(abspath win/<proj>.dll);application/x-nacl
-LAUNCH_HOST: CHECK_FOR_CHROME all
-<TAB>$(CHROME_PATH) $(HOST_ARGS) "localhost:5103/index_win.html"
-"""
 
 #
 # Lib rules for various platforms.
@@ -170,9 +165,9 @@
   'DEFINE': '-D%s',
   'INCLUDE': '-I%s',
   'LIBRARY': '-l%s',
-  'MAIN': '<tc>/<config>/lib<proj>_<ARCH>.so',
-  'NMFMAIN': '<tc>/<config>/lib<proj>_<ARCH>.so',
-  'SO': '<tc>/<config>/lib<proj>_<ARCH>.so',
+  'MAIN': '<tc>/<config>/lib<proj>.so',
+  'NMFMAIN': '<tc>/<config>/lib<proj>.so',
+  'SO': '<tc>/<config>/lib<proj>.so',
   'LIB': '$(NACL_SDK_ROOT)/lib/linux_<ARCH>_host/<config>/lib<proj>.a',
 }
 
@@ -203,16 +198,11 @@
 #
 # Various Architectures
 #
-LINUX_32 = {
-  '<arch>': '32',
-  '<ARCH>': 'x86_32',
-  '<MACH>': '-m32',
+LINUX = {
+  '<arch>': '',
+  '<ARCH>': '',
+  '<MACH>': '',
 }
-LINUX_64 = {
-  '<arch>': '64',
-  '<ARCH>': 'x86_64',
-  '<MACH>': '-m64',
-}
 NACL_X86_32 = {
   '<arch>': '32',
   '<ARCH>': 'x86_32',
@@ -281,7 +271,7 @@
     'TOOL': WIN_TOOL
   },
   'linux' : {
-    'ARCHES': [LINUX_32, LINUX_64],
+    'ARCHES': [LINUX],
     'DEFS': LINUX_DEFAULTS,
     'CC': SO_CC_RULES,
     'CXX': SO_CC_RULES,
@@ -367,6 +357,13 @@
     return '%s_%s_%s_%s_O' % (self.project.upper(), self.tc.upper(),
                               self.cfg.upper(), self.arch['<ARCH>'])
 
+  def GetPepperPlugin(self):
+    plugin = self.Replace(BUILD_RULES[self.tc]['TOOL']['MAIN'])
+    text = 'PPAPI_<CONFIG>:=$(abspath %s)' % plugin
+    text += ';application/x-ppapi-%s\n' % self.vars['<config>'].lower()
+    return self.Replace(text)
+
+
   def SetArch(self, arch):
     self.arch = arch
     for key in arch: