Move the Windows sandbox to sandbox/win

sandbox/win/sandbox_win.gypi

 # 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.
 
 {
   'target_defaults': {
     'variables': {
       'sandbox_windows_target': 0,
     },
     'target_conditions': [
@@ skipping 148 matching lines @@
         'src/sidestep\ia32_opcode_map.cpp',
         'src/sidestep\mini_disassembler_types.h',
         'src/sidestep\mini_disassembler.cpp',
         'src/sidestep\mini_disassembler.h',
         'src/sidestep\preamble_patcher_with_stub.cpp',
         'src/sidestep\preamble_patcher.h',
         'src/Wow64.cc',
         'src/Wow64.h',
       ],
       'include_dirs': [
-        '..',
+        '../..',

[rvargas (doing something else), 2012/07/16 21:52:38]

Do we still need this?

[jln (very slow on Chromium), 2012/07/16 22:12:36]

I don't know, but if we don't, I would rather make that change afterwards, when
it's not mega hairy and can't go through try jobs :)

       ],
       'copies': [
         {
           'destination': '<(PRODUCT_DIR)',
           'files': [
-            'wow_helper/wow_helper.exe',
-            'wow_helper/wow_helper.pdb',
+            #FIXME just for trybot

[rvargas (doing something else), 2012/07/16 21:52:38]

Not cool

[jln (very slow on Chromium), 2012/07/16 22:12:36]

Yep, very unfortunate, but trybots don't support binary files.

[rvargas (doing something else), 2012/07/16 22:26:02]

Sure, but it seems like you are already trying to land the patch, and this
should be fixed before landing.

+            #'wow_helper/wow_helper.exe',
+            #'wow_helper/wow_helper.pdb',
           ],

[cpu_(ooo_6.6-7.5), 2012/07/17 19:50:59]

Hmm I didn't see this. Please fix.

[jln (very slow on Chromium), 2012/07/17 23:01:55]

Done.

FYI: this was not part of what I was trying to send via SVN, but indeed this
should never have ended up here.
FYI2: I'm using https://chromiumcodereview.appspot.com/10783004/ for the trybot
version

         },
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           'src',
-          '..',
+          '../..',
         ],
       },
     },
     {
       'target_name': 'sandbox_win64',
       'type': 'static_library',
       'variables': {
         'sandbox_windows_target': 1,
       },
       'dependencies': [
         '../testing/gtest.gyp:gtest',
         '../base/base.gyp:base_nacl_win64',
         '../base/base.gyp:base_static_win64',
       ],
       'configurations': {
         'Common_Base': {
           'msvs_target_platform': 'x64',
         },
       },
       'sources': [
         # Files that are used by the 64-bit version of Windows sandbox only.
         'src/interceptors_64.cc',
         'src/interceptors_64.h',
         'src/resolver_64.cc',
         'src/service_resolver_64.cc',
         'src/Wow64_64.cc',
       ],
       'include_dirs': [
-        '..',
+        '../..',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           'src',
-          '..',
+          '../..',
         ],
       },
       'defines': [
         '<@(nacl_win64_defines)',
       ]
     },
     {
       'target_name': 'sbox_integration_tests',
       'type': 'executable',
       'dependencies': [
@@ skipping 67 matching lines @@
       'dependencies': [
         'sandbox',
         'pocdll',
       ],
       'sources': [
         'sandbox_poc/main_ui_window.cc',
         'sandbox_poc/main_ui_window.h',
         'sandbox_poc/resource.h',
         'sandbox_poc/sandbox.cc',
         'sandbox_poc/sandbox.h',
-        'sandbox_poc/sandbox.ico',
+        #FIXME - just for trybot

[rvargas (doing something else), 2012/07/16 21:52:38]

err... search?

[jln (very slow on Chromium), 2012/07/16 22:12:36]

Ditto.

+        #'sandbox_poc/sandbox.ico',
         'sandbox_poc/sandbox.rc',
       ],
       'link_settings': {
         'libraries': [
           '-lcomctl32.lib',
         ],
       },
       'msvs_settings': {
         'VCLinkerTool': {
           'SubSystem': '2',         # Set /SUBSYSTEM:WINDOWS
@@ skipping 12 matching lines @@
         'sandbox_poc/pocdll/pocdll.cc',
         'sandbox_poc/pocdll/processes_and_threads.cc',
         'sandbox_poc/pocdll/registry.cc',
         'sandbox_poc/pocdll/spyware.cc',
         'sandbox_poc/pocdll/utils.h',
       ],
       'defines': [
         'POCDLL_EXPORTS',
       ],
       'include_dirs': [
-        '..',
+        '../..',
       ],
     },
   ],
 }