Add YouTube 15.09
Change-Id: I8985bd962e635577d6f21e9a936f317b12fe88d4
diff --git a/build.gradle b/build.gradle
index 2b39b08..fd47c97 100644
--- a/build.gradle
+++ b/build.gradle
@@ -427,7 +427,8 @@
"youtube/youtube.android_13.37",
"youtube/youtube.android_14.19",
"youtube/youtube.android_14.44",
- "youtube/youtube.android_15.08"
+ "youtube/youtube.android_15.08",
+ "youtube/youtube.android_15.09"
],
]
diff --git a/third_party/youtube/youtube.android_15.09.tar.gz.sha1 b/third_party/youtube/youtube.android_15.09.tar.gz.sha1
new file mode 100644
index 0000000..b5c44a1
--- /dev/null
+++ b/third_party/youtube/youtube.android_15.09.tar.gz.sha1
@@ -0,0 +1 @@
+6acec0dc032536d90798060badaed13154c92685
\ No newline at end of file
diff --git a/tools/run_on_app.py b/tools/run_on_app.py
index 9877888..b96ccf4 100755
--- a/tools/run_on_app.py
+++ b/tools/run_on_app.py
@@ -190,6 +190,7 @@
# (app, version, type), e.g., ('gmail', '180826.15', 'deploy'),
('youtube', '13.37', 'deploy'), # b/120977564
('youtube', '15.08', 'deploy'), # b/150267318
+ ('youtube', '15.09', 'deploy'), # b/150267318
]
def get_permutations():
diff --git a/tools/youtube_data.py b/tools/youtube_data.py
index e106014..e8accdd 100644
--- a/tools/youtube_data.py
+++ b/tools/youtube_data.py
@@ -31,6 +31,9 @@
V15_08_BASE = os.path.join(BASE, 'youtube.android_15.08')
V15_08_PREFIX = os.path.join(V15_08_BASE, 'YouTubeRelease')
+V15_09_BASE = os.path.join(BASE, 'youtube.android_15.09')
+V15_09_PREFIX = os.path.join(V15_09_BASE, 'YouTubeRelease')
+
# NOTE: we always use android.jar for SDK v25, later we might want to revise it
# to use proper android.jar version for each of youtube version separately.
ANDROID_JAR = utils.get_android_jar(25)
@@ -211,4 +214,34 @@
'min-api' : ANDROID_L_API,
}
},
+ '15.09': {
+ 'dex' : {
+ 'inputs': [os.path.join(V15_09_BASE, 'YouTubeRelease_unsigned.apk')],
+ 'pgmap': '%s_proguard.map' % V15_09_PREFIX,
+ 'libraries' : [ANDROID_JAR],
+ 'min-api' : ANDROID_L_API,
+ },
+ 'deploy' : {
+ # When -injars and -libraryjars are used for specifying inputs library
+ # sanitization is on by default. For this version of YouTube -injars and
+ # -libraryjars are not used, but library sanitization is still required.
+ 'sanitize_libraries': True,
+ 'inputs': ['%s_deploy.jar' % V15_09_PREFIX],
+ 'libraries' : [os.path.join(V15_09_BASE, 'legacy_YouTubeRelease_combined_library_jars.jar')],
+ 'pgconf': [
+ '%s_proguard.config' % V15_09_PREFIX,
+ '%s/proguardsettings/YouTubeRelease_proguard.config' % utils.THIRD_PARTY],
+ 'proto-shrinking': 1,
+ 'maindexrules' : [
+ os.path.join(V15_09_BASE, 'mainDexClasses.rules'),
+ os.path.join(V15_09_BASE, 'main-dex-classes-release-optimized.pgcfg'),
+ os.path.join(V15_09_BASE, 'main_dex_YouTubeRelease_proguard.cfg')],
+ 'min-api' : ANDROID_H_MR2_API,
+ },
+ 'proguarded' : {
+ 'inputs': ['%s_proguard.jar' % V15_09_PREFIX],
+ 'pgmap': '%s_proguard.map' % V15_09_PREFIX,
+ 'min-api' : ANDROID_L_API,
+ }
+ },
}