Workaround file limit issue on release archive bot
This will only build and archive the files needed for an 1.4 release.
Test: tools/gradle.py clean && BUILDBOT_SLAVENAME=slave tools/archive.py --dry-run
Bug: 127264123
Change-Id: I91ff7d2812bd9858baab4772fda31210efb41795
diff --git a/tools/archive.py b/tools/archive.py
index 2ebb108..659f411 100755
--- a/tools/archive.py
+++ b/tools/archive.py
@@ -94,9 +94,10 @@
# Generate an r8-ed build without dependencies.
# The '-Pno_internal' flag is important because we generate the lib based on uses in tests.
- gradle.RunGradleExcludeDeps([utils.R8LIB_NO_DEPS, '-Pno_internal'])
- shutil.copyfile(utils.R8LIB_JAR, utils.R8LIB_EXCLUDE_DEPS_JAR)
- shutil.copyfile(utils.R8LIB_JAR + '.map', utils.R8LIB_EXCLUDE_DEPS_JAR + '.map')
+ # TODO(127264123): Remove commented out lines.
+ # gradle.RunGradleExcludeDeps([utils.R8LIB_NO_DEPS, '-Pno_internal'])
+ # shutil.copyfile(utils.R8LIB_JAR, utils.R8LIB_EXCLUDE_DEPS_JAR)
+ # shutil.copyfile(utils.R8LIB_JAR + '.map', utils.R8LIB_EXCLUDE_DEPS_JAR + '.map')
# Create maven release which uses a build that exclude dependencies.
create_maven_release.main(["--out", utils.LIBS])
@@ -109,14 +110,15 @@
# The target tasks postfixed by 'lib' depend on the actual target task so
# building it invokes the original task first.
# The '-Pno_internal' flag is important because we generate the lib based on uses in tests.
+ # TODO(127264123): Remove commented out targets.
gradle.RunGradle([
utils.R8,
utils.D8,
utils.COMPATDX,
utils.COMPATPROGUARD,
- utils.R8LIB,
- utils.COMPATDXLIB,
- utils.COMPATPROGUARDLIB,
+ # utils.R8LIB,
+ # utils.COMPATDXLIB,
+ # utils.COMPATPROGUARDLIB,
'-Pno_internal'
])
version = GetVersion()
@@ -137,21 +139,22 @@
'releaser=go/r8bot (' + os.environ.get('BUILDBOT_SLAVENAME') + ')\n')
version_writer.write('version-file.version.code=1\n')
+ # TODO(127264123): Remove commented out files.
for file in [
utils.D8_JAR,
utils.R8_JAR,
- utils.R8LIB_JAR,
- utils.R8LIB_JAR + '.map',
+ # utils.R8LIB_JAR,
+ # utils.R8LIB_JAR + '.map',
utils.R8_SRC_JAR,
utils.R8_FULL_EXCLUDE_DEPS_JAR,
- utils.R8LIB_EXCLUDE_DEPS_JAR,
- utils.R8LIB_EXCLUDE_DEPS_JAR + '.map',
+ # utils.R8LIB_EXCLUDE_DEPS_JAR,
+ # utils.R8LIB_EXCLUDE_DEPS_JAR + '.map',
utils.COMPATDX_JAR,
- utils.COMPATDXLIB_JAR,
- utils.COMPATDXLIB_JAR + '.map',
+ # utils.COMPATDXLIB_JAR,
+ # utils.COMPATDXLIB_JAR + '.map',
utils.COMPATPROGUARD_JAR,
- utils.COMPATPROGUARDLIB_JAR,
- utils.COMPATPROGUARDLIB_JAR + '.map',
+ # utils.COMPATPROGUARDLIB_JAR,
+ # utils.COMPATPROGUARDLIB_JAR + '.map',
utils.MAVEN_ZIP,
utils.GENERATED_LICENSE,
]:
diff --git a/tools/utils.py b/tools/utils.py
index 682213a..987471c 100644
--- a/tools/utils.py
+++ b/tools/utils.py
@@ -41,7 +41,7 @@
D8_JAR = os.path.join(LIBS, 'd8.jar')
R8_JAR = os.path.join(LIBS, 'r8.jar')
R8LIB_JAR = os.path.join(LIBS, 'r8lib.jar')
-R8_SRC_JAR = os.path.join(LIBS, 'r8-src.jar')
+R8_SRC_JAR = os.path.join(LIBS, '1.4-src.jar')
R8LIB_EXCLUDE_DEPS_JAR = os.path.join(LIBS, 'r8lib-exclude-deps.jar')
R8_FULL_EXCLUDE_DEPS_JAR = os.path.join(LIBS, 'r8-full-exclude-deps.jar')
COMPATDX_JAR = os.path.join(LIBS, 'compatdx.jar')
@@ -313,5 +313,3 @@
def uncompressed_size(path):
return sum(z.file_size for z in zipfile.ZipFile(path).infolist())
-
-
