[NaCl SDK] Fix bug in archive step introduced in r133963

native_client_sdk/src/build_tools/build_sdk.py

 #!/usr/bin/env python
 # 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.
 
 """Entry point for both build and try bots
 
 This script is invoked from XXX, usually without arguments
 to package an SDK. It automatically determines whether
 this SDK is for mac, win, linux.
@@ skipping 666 matching lines @@
       if os.path.isfile(makefile):
         print "\n\nMake: " + dirnode
         buildbot_common.Run(['make', 'all', '-j8'],
                             cwd=os.path.abspath(dirnode), shell=True)
 
   # Archive on non-trybots.
   if options.archive or '-sdk' in os.environ.get('BUILDBOT_BUILDERNAME', ''):
     buildbot_common.BuildStep('Archive build')
     bucket_path = 'nativeclient-mirror/nacl/nacl_sdk/%s' % \
         build_utils.ChromeVersion()
-    buildbot_common.Archive(tarname, bucket_path, OUT_DIR)
+    buildbot_common.Archive(os.path.relpath(tarfile, OUT_DIR),
+                            bucket_path, OUT_DIR)
 
     # generate "manifest snippet" for this archive.
     if not skip_test_updater:
       archive = bundle.GetArchive(manifest_util.GetHostOS())
       archive.url = 'https://commondatastorage.googleapis.com/' \
           'nativeclient-mirror/nacl/nacl_sdk/%s/%s' % (
               build_utils.ChromeVersion(), tarname)
       manifest_snippet_file = os.path.join(OUT_DIR, tarname + '.json')
       with open(manifest_snippet_file, 'wb') as manifest_snippet_stream:
         manifest_snippet_stream.write(bundle.ToJSON())
 
       buildbot_common.Archive(tarname + '.json', bucket_path, OUT_DIR,
                               step_link=False)
 
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))