remove defines from build-libchromiumcontent (#11927)

script/bootstrap.py

@@ -42,7 +42,7 @@ def main():
 
   # Redirect to use local libchromiumcontent build.
   if args.build_release_libcc or args.build_debug_libcc:
-    build_libchromiumcontent(args.verbose, args.target_arch, defines,
+    build_libchromiumcontent(args.verbose, args.target_arch,
                              args.build_debug_libcc, args.update_libcc)
     dist_dir = os.path.join(VENDOR_DIR, 'libchromiumcontent', 'dist', 'main')
     libcc_source_path = os.path.join(dist_dir, 'src')
@@ -172,7 +172,7 @@ def update_win32_python():
       execute_stdout(['git', 'clone', PYTHON_26_URL])
 
 
-def build_libchromiumcontent(verbose, target_arch, defines, debug,
+def build_libchromiumcontent(verbose, target_arch, debug,
                              force_update):
   args = [sys.executable,
           os.path.join(SOURCE_ROOT, 'script', 'build-libchromiumcontent.py')]
@@ -182,8 +182,6 @@ def build_libchromiumcontent(verbose, target_arch, defines, debug,
     args += ['--force-update']
   if verbose:
     args += ['-v']
-  if defines:
-    args += ['--defines', defines]
   execute_stdout(args + ['--target_arch', target_arch])
 
 

script/build-libchromiumcontent.py

@@ -35,7 +35,7 @@ def main():
     enable_verbose_mode()
 
   # ./script/bootstrap
-  # ./script/update -t x64 --defines=''
+  # ./script/update -t x64
   # ./script/build --no_shared_library -t x64
   # ./script/create-dist -c static_library -t x64 --no_zip
   script_dir = os.path.join(LIBCC_DIR, 'script')
@@ -45,8 +45,7 @@ def main():
   create_dist = os.path.join(script_dir, 'create-dist')
   if args.force_update or libchromiumcontent_outdated():
     execute_stdout([sys.executable, bootstrap])
-    execute_stdout([sys.executable, update, '-t', args.target_arch,
-                    '--defines', args.defines])
+    execute_stdout([sys.executable, update, '-t', args.target_arch])
     update_gclient_done_marker()
   if args.debug:
     execute_stdout([sys.executable, build, '-D', '-t', args.target_arch])
@@ -63,8 +62,6 @@ def parse_args():
   parser = argparse.ArgumentParser(description='Build libchromiumcontent')
   parser.add_argument('--target_arch',
                       help='Specify the arch to build for')
-  parser.add_argument('--defines', default='',
-                      help='The definetions passed to gyp')
   parser.add_argument('-v', '--verbose', action='store_true',
                       help='Prints the output of the subprocesses')
   parser.add_argument('-d', '--debug', action='store_true',