Fix arm library path for nacl tests

build/config/nacl/rules.gni

 # Copyright 2015 The Native Client Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/features.gni")
 import("//build/config/nacl/config.gni")
 
 # Generate a nmf file
 #
 # Native Client Manifest (nmf) is a JSON file that tells the browser where to
@@ skipping 64 matching lines @@
       data = []
 
       nmfflags += [ "--library-path=" + rebase_path(root_out_dir) ]
 
       # NOTE: There is no explicit dependency for the lib directory
       # (lib32 and lib64 for x86/x64) created in the product directory.
       # They are created as a side-effect of nmf creation.
       if (current_cpu != "x86" && current_cpu != "x64") {
         nmfflags +=
             [ "--library-path=" + rebase_path("${nacl_toolchain_tooldir}/lib") ]
-        data += [ "${lib_path}/lib/" ]
+        if (current_cpu == "arm") {
+          data += [ "${lib_path}/libarm/" ]
+        } else {
+          data += [ "${lib_path}/lib/" ]
+        }
       } else {
         # For x86-32, the lib/ directory is called lib32/ instead.
         if (current_cpu == "x86") {
           nmfflags += [ "--library-path=" +
                         rebase_path("${nacl_toolchain_tooldir}/lib32") ]
           data += [ "${lib_path}/lib32/" ]
         }
 
         # x86-32 Windows needs to build both x86-32 and x86-64 NaCl
         # binaries into the same nmf covering both architectures.  That
@@ skipping 76 matching lines @@
     args = [
       "--program=" + rebase_path(executable, root_build_dir),
       "--arch=${arch}",
       "--output=" + rebase_path(nmf, root_build_dir),
     ]
     if (defined(invoker.nmfflags)) {
       args += invoker.nmfflags
     }
   }
 }