[NaCl AddIn] Update location of PNaCl executables.

This changed with pepper_30 but the addin was not updated.

R=binji@chromium.org

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

git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1565 050acbb0-2703-11df-ab0a-9f3f633ae91d
diff --git a/InstallerResources/PNaCl/Microsoft.Cpp.PNaCl.targets b/InstallerResources/PNaCl/Microsoft.Cpp.PNaCl.targets
index be00fdb..e11eb97 100644
--- a/InstallerResources/PNaCl/Microsoft.Cpp.PNaCl.targets
+++ b/InstallerResources/PNaCl/Microsoft.Cpp.PNaCl.targets
@@ -31,7 +31,7 @@
                  ProcessorNumber                    ="%(ClCompile.ProcessorNumber)"
                  MultiProcessorCompilation          ="%(ClCompile.MultiProcessorCompilation)"
                  MinimalRebuildFromTracking         ="%(ClCompile.MinimalRebuildFromTracking)"
-                 NaCLCompilerPath                   ="$(VSNaClSDKRoot)toolchain\win_x86_pnacl\newlib\bin\pnacl-clang.bat"
+                 NaCLCompilerPath                   ="$(VSNaClSDKRoot)toolchain\win_pnacl\bin\pnacl-clang.bat"
                  PropertiesFile                     ="$(VCTargetsPath)\NaCl\Props\nacl_compile.xml"
                  TLogReadFiles                      ="@(CLTLogReadFiles)"
                  TLogWriteFiles                     ="@(CLTLogWriteFiles)"
@@ -58,7 +58,7 @@
     <NaClLink BuildingInIDE                  ="$(BuildingInsideVisualStudio)"
               Sources                        ="@(Link)"
               OutputCommandLine              ="%(Link.OutputCommandLine)"
-              NaClLinkerPath                 ="$(VSNaClSDKRoot)toolchain\win_x86_pnacl\newlib\bin\pnacl-clang++.bat"
+              NaClLinkerPath                 ="$(VSNaClSDKRoot)toolchain\win_pnacl\bin\pnacl-clang++.bat"
               CreateNMFPath                  ="$(VSNaClSDKRoot)tools\create_nmf.py"
               MinimalRebuildFromTracking     ="$(Link_MinimalRebuildFromTracking)"
               OutputFile                     ="%(Link.OutputFile)"
@@ -101,7 +101,7 @@
     <NaClLib BuildingInIDE                  ="$(BuildingInsideVisualStudio)"
              Sources                        ="@(Lib)"
              OutputCommandLine              ="%(Lib.OutputCommandLine)"
-             LibrarianToolPath              ="$(VSNaClSDKRoot)toolchain\win_x86_pnacl\newlib\bin\pnacl-ar.bat"
+             LibrarianToolPath              ="$(VSNaClSDKRoot)toolchain\win_pnacl\bin\pnacl-ar.bat"
              MinimalRebuildFromTracking     ="%(Lib.MinimalRebuildFromTracking)"
              OutputFile                     ="%(Lib.OutputFile)"
              PropertiesFile                 ="$(VCTargetsPath)\NaCl\Props\nacl_lib.xml"
diff --git a/NaCl.Build.CPPTasks/NaClCompile.cs b/NaCl.Build.CPPTasks/NaClCompile.cs
index 9f607ce..3838764 100644
--- a/NaCl.Build.CPPTasks/NaClCompile.cs
+++ b/NaCl.Build.CPPTasks/NaClCompile.cs
@@ -226,7 +226,6 @@
                 // The SDK root is five levels up from the compiler binary.
                 string sdkroot = Path.GetDirectoryName(Path.GetDirectoryName(pathToTool));
                 sdkroot = Path.GetDirectoryName(Path.GetDirectoryName(sdkroot));
-                sdkroot = Path.GetDirectoryName(sdkroot);
 
                 if (!SDKUtilities.SupportsPNaCl(sdkroot))
                 {
diff --git a/buildbot_run.py b/buildbot_run.py
index faed334..bf0016e 100755
--- a/buildbot_run.py
+++ b/buildbot_run.py
@@ -20,7 +20,7 @@
 GSURL = 'https://commondatastorage.googleapis.com'
 GSPATH = 'nativeclient-mirror/nacl/nacl_sdk/sdk'
 SDKROOT = os.path.join('..', '..', 'out', 'sdk')
-SDK_VERSIONS = ['pepper_27', 'pepper_28', 'pepper_canary']
+SDK_VERSIONS = ['pepper_31', 'pepper32', 'pepper_canary']
 
 
 def Log(msg):