Only distribute one R8 jar to the Android Platform and Android Studio
Bug: 145339280
Change-Id: I8b508cd535381331ef146a6be05ccb805791109a
diff --git a/tools/update_prebuilds_in_android.py b/tools/update_prebuilds_in_android.py
index d059fb3..ae1ed2c 100755
--- a/tools/update_prebuilds_in_android.py
+++ b/tools/update_prebuilds_in_android.py
@@ -17,14 +17,10 @@
JAR_TARGETS_MAP = {
'full': [
- (utils.R8, 'r8-master'),
- (utils.COMPATDX, 'compatdx-master'),
- (utils.COMPATPROGUARD, 'compatproguard-master'),
+ (utils.R8, 'r8'),
],
'lib': [
- (utils.R8LIB, 'r8-master'),
- (utils.COMPATDXLIB, 'compatdx-master'),
- (utils.COMPATPROGUARDLIB, 'compatproguard-master'),
+ (utils.R8LIB, 'r8'),
],
}
@@ -66,6 +62,10 @@
if maps:
print 'Copying: ' + src + '.map -> ' + dest + '.map'
copyfile(src + '.map', dest + '.map')
+ else:
+ print ('WARNING: Not copying ' + src + ' -> ' + dest +
+ ', as' + dest + ' does not exist already')
+
def copy_jar_targets(root, target_root, jar_targets, maps):
