Add main dex Proguard rules for YouTube 12.22
Update the application runner script to handle main dex rules.
R=ager@google.com
Change-Id: Ie6742fa4e59f7030fd5af393cb3f3e73a46a51ce
diff --git a/third_party/youtube/youtube.android_12.22.tar.gz.sha1 b/third_party/youtube/youtube.android_12.22.tar.gz.sha1
index e2544d2..8f6813c 100644
--- a/third_party/youtube/youtube.android_12.22.tar.gz.sha1
+++ b/third_party/youtube/youtube.android_12.22.tar.gz.sha1
@@ -1 +1 @@
-284258a4cb50e21f972de603b57b5e9be1e78308
\ No newline at end of file
+73c4880898d734064815d0426d8fe84ee6d075b4
\ No newline at end of file
diff --git a/tools/run_on_app.py b/tools/run_on_app.py
index 9b4cb4d..574830c 100755
--- a/tools/run_on_app.py
+++ b/tools/run_on_app.py
@@ -127,6 +127,9 @@
args.extend(['--pg-conf', pgconf])
if options.k:
args.extend(['--pg-conf', options.k])
+ if 'multidexrules' in values:
+ for rules in values['multidexrules']:
+ args.extend(['--multidex-rules', rules])
if not options.no_libraries and 'libraries' in values:
for lib in values['libraries']:
diff --git a/tools/youtube_data.py b/tools/youtube_data.py
index e519571..b32a372 100644
--- a/tools/youtube_data.py
+++ b/tools/youtube_data.py
@@ -66,8 +66,13 @@
},
'deploy' : {
'inputs': ['%s_deploy.jar' % V12_22_PREFIX],
- 'pgconf': ['%s_proguard.config' % V12_22_PREFIX,
- '%s/proguardsettings/YouTubeRelease_proguard.config' % THIRD_PARTY],
+ 'pgconf': [
+ '%s_proguard.config' % V12_22_PREFIX,
+ '%s/proguardsettings/YouTubeRelease_proguard.config' % THIRD_PARTY],
+ 'multidexrules' : [
+ os.path.join(V12_22_BASE, 'mainDexClasses.rules'),
+ os.path.join(V12_22_BASE, 'main-dex-classes-release.cfg'),
+ os.path.join(V12_22_BASE, 'main_dex_YouTubeRelease_proguard.cfg')],
},
'proguarded' : {
'inputs': ['%s_proguard.jar' % V12_22_PREFIX],
