Remove new_gradle flag from scripts, don't support running old gradle
Bug: 270105162
Change-Id: Iacb274b4a498d536dae2356939d6282b11d7721f
diff --git a/tools/archive.py b/tools/archive.py
index 8ec73ea..b868296 100755
--- a/tools/archive.py
+++ b/tools/archive.py
@@ -162,7 +162,7 @@
utils.GRADLE_TASK_SOURCE_JAR,
utils.GRADLE_TASK_SWISS_ARMY_KNIFE,
'-Pno_internal'
- ], new_gradle=True)
+ ])
# Create maven release of the desuage_jdk_libs configuration. This require
# an r8.jar with dependencies to have been built.
diff --git a/tools/archive_desugar_jdk_libs.py b/tools/archive_desugar_jdk_libs.py
index 577b305..30d40a4 100755
--- a/tools/archive_desugar_jdk_libs.py
+++ b/tools/archive_desugar_jdk_libs.py
@@ -256,7 +256,7 @@
gradle.RunGradle([utils.GRADLE_TASK_R8,
utils.GRADLE_TASK_TEST_JAR,
utils.GRADLE_TASK_TEST_DEPS_JAR,
- '-Pno_internal'], new_gradle=True)
+ '-Pno_internal'])
with utils.TempDir() as tmp:
with zipfile.ZipFile(maven_zip, 'r') as zip_ref:
zip_ref.extractall(tmp)
diff --git a/tools/create_maven_release.py b/tools/create_maven_release.py
index 255926f..ac7aa85 100755
--- a/tools/create_maven_release.py
+++ b/tools/create_maven_release.py
@@ -248,11 +248,9 @@
base_no_zip = out[0:len(out)-4]
make_archive(base_no_zip, 'zip', tmp_dir)
-def generate_r8_maven_zip(out, version_file=None, skip_gradle_build=False,
- new_gradle=False):
+def generate_r8_maven_zip(out, version_file=None, skip_gradle_build=False):
if not skip_gradle_build:
- gradle.RunGradle([utils.GRADLE_TASK_R8LIB,
- '-Pno_internal'], new_gradle=True)
+ gradle.RunGradle([utils.GRADLE_TASK_R8LIB, '-Pno_internal'])
version = determine_version()
with utils.TempDir() as tmp_dir:
file_copy = join(tmp_dir, 'copy_of_jar.jar')
diff --git a/tools/desugar_jdk_libs_repository.py b/tools/desugar_jdk_libs_repository.py
index eb68287..d128bc6 100755
--- a/tools/desugar_jdk_libs_repository.py
+++ b/tools/desugar_jdk_libs_repository.py
@@ -131,7 +131,7 @@
implementation_maven_zip = 'desugar_jdk_libs_jdk11_nio.zip'
release_archive_location = 'desugar_jdk_libs_nio'
implementation_build_output = join('bazel-bin', implementation_maven_zip)
- gradle.RunGradle([utils.GRADLE_TASK_R8], new_gradle=True)
+ gradle.RunGradle([utils.GRADLE_TASK_R8])
with utils.TempDir() as tmp_dir:
(name, configuration_version) = utils.desugar_configuration_name_and_version(configuration, False)
if (args.release_version != None and args.release_version != configuration_version):
diff --git a/tools/golem_build.py b/tools/golem_build.py
index c1f0767..4f668d6 100755
--- a/tools/golem_build.py
+++ b/tools/golem_build.py
@@ -21,7 +21,7 @@
targets.update(lower(run_benchmark.GOLEM_BUILD_TARGETS))
targets.update(lower(run_on_app_dump.GOLEM_BUILD_TARGETS))
cmd = GRADLE_ARGS + [target for target in targets]
- gradle.RunGradle(cmd, new_gradle=True)
+ gradle.RunGradle(cmd)
if __name__ == '__main__':
sys.exit(Main())
diff --git a/tools/gradle.py b/tools/gradle.py
index 3e3c464..54e26ee 100755
--- a/tools/gradle.py
+++ b/tools/gradle.py
@@ -16,13 +16,11 @@
import utils
GRADLE_DIR = os.path.join(utils.REPO_ROOT, 'third_party', 'gradle')
-GRADLE_SHA1 = os.path.join(GRADLE_DIR, 'gradle.tar.gz.sha1')
GRADLE8_SHA1 = os.path.join(GRADLE_DIR, 'gradle-8.3.tar.gz.sha1')
-GRADLE_TGZ = os.path.join(GRADLE_DIR, 'gradle.tar.gz')
GRADLE8_TGZ = os.path.join(GRADLE_DIR, 'gradle-8.3.tar.gz')
-def get_gradle(new_gradle):
- gradle_dir = 'gradle-8.3' if new_gradle else 'gradle'
+def get_gradle():
+ gradle_dir = 'gradle-8.3'
if utils.IsWindows():
return os.path.join(GRADLE_DIR, gradle_dir, 'bin', 'gradle.bat')
else:
@@ -33,9 +31,6 @@
parser.add_argument('--exclude-deps', '--exclude_deps',
help='Build without internalized dependencies.',
default=False, action='store_true')
- parser.add_argument('--new-gradle', '--new_gradle',
- help='Run with new experimental gradle configuration',
- default=False, action='store_true')
parser.add_argument('--no-internal', '--no_internal',
help='Do not build with support for Google internal tests.',
default=False, action='store_true')
@@ -79,14 +74,10 @@
EnsureGradle()
EnsureJdk()
-def RunGradleIn(
- gradleCmd, args, cwd, throw_on_failure=True, env=None, new_gradle=False):
+def RunGradleIn(gradleCmd, args, cwd, throw_on_failure=True, env=None):
EnsureDeps()
cmd = [gradleCmd]
- if new_gradle:
- args.extend(['--offline', '-c=d8_r8/settings.gradle.kts'])
- else:
- args.append('-b=build.gradle')
+ args.extend(['--offline', '-c=d8_r8/settings.gradle.kts'])
cmd.extend(args)
utils.PrintCmd(cmd)
with utils.ChangedWorkingDirectory(cwd):
@@ -98,14 +89,13 @@
def RunGradleWrapperIn(args, cwd, throw_on_failure=True, env=None):
return RunGradleIn('./gradlew', args, cwd, throw_on_failure, env=env)
-def RunGradle(args, throw_on_failure=True, env=None, new_gradle=False):
+def RunGradle(args, throw_on_failure=True, env=None):
return RunGradleIn(
- get_gradle(new_gradle),
+ get_gradle(),
args,
utils.REPO_ROOT,
throw_on_failure,
- env=env,
- new_gradle=new_gradle)
+ env=env)
def RunGradleExcludeDeps(args, throw_on_failure=True, env=None):
EnsureDeps()
@@ -123,9 +113,9 @@
def RunGradleWrapperInGetOutput(args, cwd, env=None):
return RunGradleInGetOutput('./gradlew', args, cwd, env=env)
-def RunGradleGetOutput(args, env=None, new_gradle=False):
+def RunGradleGetOutput(args, env=None):
return RunGradleInGetOutput(
- get_gradle(new_gradle),
+ get_gradle(),
args,
utils.REPO_ROOT,
env=env)
@@ -140,7 +130,7 @@
args.append('-Pexclude_deps')
if options.worktree:
args.append('-g=' + os.path.join(utils.REPO_ROOT, ".gradle_user_home"))
- return RunGradle(args, new_gradle=options.new_gradle)
+ return RunGradle(args)
if __name__ == '__main__':
sys.exit(Main())
diff --git a/tools/internal_test.py b/tools/internal_test.py
index b1396d0..47844c8 100755
--- a/tools/internal_test.py
+++ b/tools/internal_test.py
@@ -366,7 +366,7 @@
[execute(cmd, archive, env) for cmd in CLEAN_COMMANDS]
failed = any([execute(cmd, archive, env) for cmd in TEST_COMMANDS])
# Gradle daemon occasionally leaks memory, stop it.
- gradle.RunGradle(['--stop'], new_gradle=True)
+ gradle.RunGradle(['--stop'])
archive_status(1 if failed else 0)
return failed
diff --git a/tools/run_benchmark.py b/tools/run_benchmark.py
index 4a2b79b..0d1e4fd 100755
--- a/tools/run_benchmark.py
+++ b/tools/run_benchmark.py
@@ -97,7 +97,7 @@
r8jar = compiledump.download_distribution(options.version, options.nolib, temp)
if not options.no_build:
- gradle.RunGradle(buildTargets + ['-Pno_internal'], new_gradle=True)
+ gradle.RunGradle(buildTargets + ['-Pno_internal'])
if not options.golem:
# When running locally, change the working directory to be in 'temp'.
diff --git a/tools/run_on_app.py b/tools/run_on_app.py
index ce3a4ac..0196e3f 100755
--- a/tools/run_on_app.py
+++ b/tools/run_on_app.py
@@ -239,7 +239,7 @@
def run_all(options, args):
# Build first so that each job won't.
if should_build(options):
- gradle.RunGradle([utils.GRADLE_TASK_R8LIB], new_gradle=True)
+ gradle.RunGradle([utils.GRADLE_TASK_R8LIB])
options.no_build = True
assert not should_build(options)
@@ -714,7 +714,7 @@
if should_build(options):
gradle.RunGradle([
utils.GRADLE_TASK_R8LIB if tool.startswith('r8lib')
- else UTILS.GRADLE_TASK_R8], new_gradle=True)
+ else UTILS.GRADLE_TASK_R8])
t0 = time.time()
exit_code = toolhelper.run(tool, args,
build=False,
diff --git a/tools/run_on_app_dump.py b/tools/run_on_app_dump.py
index 5b5e3fc..172f8b7 100755
--- a/tools/run_on_app_dump.py
+++ b/tools/run_on_app_dump.py
@@ -1208,14 +1208,13 @@
elif options.version == 'main':
if not options.no_build:
gradle.RunGradle([utils.GRADLE_TASK_RETRACE, utils.GRADLE_TASK_R8,
- '-Pno_internal'], new_gradle=True)
+ '-Pno_internal'])
build_r8lib = False
for shrinker in options.shrinker:
if is_minified_r8(shrinker):
build_r8lib = True
if build_r8lib:
- gradle.RunGradle([utils.GRADLE_TASK_R8LIB, '-Pno_internal'],
- new_gradle=True)
+ gradle.RunGradle([utils.GRADLE_TASK_R8LIB, '-Pno_internal'])
# Make a copy of r8.jar and r8lib.jar such that they stay the same for
# the entire execution of this script.
if 'r8-nolib' in options.shrinker or 'r8-nolib-full' in options.shrinker:
diff --git a/tools/test.py b/tools/test.py
index 8ad707d..b106d33 100755
--- a/tools/test.py
+++ b/tools/test.py
@@ -241,7 +241,7 @@
def Main():
(options, args) = ParseOptions()
if utils.is_bot():
- gradle.RunGradle(['--no-daemon', 'clean'], new_gradle=True)
+ gradle.RunGradle(['--no-daemon', 'clean'])
print('Running with python ' + str(sys.version_info))
# Always print stats on bots if command cache is enabled
options.command_cache_stats = options.command_cache_dir is not None
@@ -456,8 +456,7 @@
runtimes.extend(matches)
gradle_args.append('-Pruntimes=%s' % ':'.join(runtimes))
- return_code = gradle.RunGradle(
- gradle_args, throw_on_failure=False, new_gradle=True)
+ return_code = gradle.RunGradle(gradle_args, throw_on_failure=False)
return archive_and_return(return_code, options)
# Legacy testing populates the runtimes based on dex_vm.
@@ -476,8 +475,7 @@
'-Pdex_vm=%s' % art_vm + vm_suffix,
'-Pruntimes=%s' % ':'.join(runtimes),
],
- throw_on_failure=False,
- new_gradle=True)
+ throw_on_failure=False)
if options.generate_golden_files_to:
sha1 = '%s' % utils.get_HEAD_sha1()
with utils.ChangedWorkingDirectory(options.generate_golden_files_to):
diff --git a/tools/toolhelper.py b/tools/toolhelper.py
index af49cea..f63b3ef 100644
--- a/tools/toolhelper.py
+++ b/tools/toolhelper.py
@@ -25,7 +25,7 @@
if build:
gradle.RunGradle([
utils.GRADLE_TASK_R8LIB if tool.startswith('r8lib')
- else utils.GRADLE_TASK_R8], new_gradle=True)
+ else utils.GRADLE_TASK_R8])
if track_memory_file:
cmd.extend(['tools/track_memory.sh', track_memory_file])
cmd.append(jdk.GetJavaExecutable())
diff --git a/tools/update_prebuilds_in_android.py b/tools/update_prebuilds_in_android.py
index 45e27e6..ea2c32e 100755
--- a/tools/update_prebuilds_in_android.py
+++ b/tools/update_prebuilds_in_android.py
@@ -121,7 +121,7 @@
else utils.GRADLE_TASK_R8]
if max_memory_size:
gradle_args.append('-Dorg.gradle.jvmargs=-Xmx' + max_memory_size)
- gradle.RunGradle(gradle_args, new_gradle=True)
+ gradle.RunGradle(gradle_args)
copy_jar_targets(utils.LIBS, target_root, jar_targets, maps)
copy_other_targets(utils.GENERATED_LICENSE_DIR, target_root)
