Add YouTube version 12.22
Also remove YouTube version 11.47
Change-Id: Ic453e508a5c746ce05a399f5cda5575128042a01
diff --git a/.gitignore b/.gitignore
index 2ece82e3..34c3afe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,12 +46,12 @@
third_party/proguard/proguard5.2.1
third_party/proguardsettings.tar.gz
third_party/proguardsettings/
-third_party/youtube/youtube.android_11.47
-third_party/youtube/youtube.android_11.47.tar.gz
third_party/youtube/youtube.android_12.10
third_party/youtube/youtube.android_12.10.tar.gz
third_party/youtube/youtube.android_12.17/
third_party/youtube/youtube.android_12.17.tar.gz
+third_party/youtube/youtube.android_12.22/
+third_party/youtube/youtube.android_12.22.tar.gz
third_party/jctf
third_party/jctf.tar.gz
third_party/android_cts_baseline
diff --git a/third_party/youtube/youtube.android_11.47.tar.gz.sha1 b/third_party/youtube/youtube.android_11.47.tar.gz.sha1
deleted file mode 100644
index db94984..0000000
--- a/third_party/youtube/youtube.android_11.47.tar.gz.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3c763fc5b033497dabdfff2ecd27475cfa7759a4
\ No newline at end of file
diff --git a/third_party/youtube/youtube.android_12.22.tar.gz.sha1 b/third_party/youtube/youtube.android_12.22.tar.gz.sha1
new file mode 100644
index 0000000..e2544d2
--- /dev/null
+++ b/third_party/youtube/youtube.android_12.22.tar.gz.sha1
@@ -0,0 +1 @@
+284258a4cb50e21f972de603b57b5e9be1e78308
\ No newline at end of file
diff --git a/tools/run_r8_on_app.py b/tools/run_r8_on_app.py
index 736d428..804a27e 100755
--- a/tools/run_r8_on_app.py
+++ b/tools/run_r8_on_app.py
@@ -67,7 +67,7 @@
options.version = options.version or 'v9'
data = gmscore_data
elif options.app == 'youtube':
- options.version = options.version or '12.10'
+ options.version = options.version or '12.22'
data = youtube_data
else:
raise 'Unexpected'
diff --git a/tools/youtube_data.py b/tools/youtube_data.py
index 0fb39e3..e519571 100644
--- a/tools/youtube_data.py
+++ b/tools/youtube_data.py
@@ -9,37 +9,20 @@
THIRD_PARTY = os.path.join(utils.REPO_ROOT, 'third_party')
BASE = os.path.join(THIRD_PARTY, 'youtube')
-V11_47_BASE = os.path.join(BASE, 'youtube.android_11.47')
-V11_47_PREFIX = os.path.join(V11_47_BASE, 'YouTubeRelease')
-
V12_10_BASE = os.path.join(BASE, 'youtube.android_12.10')
V12_10_PREFIX = os.path.join(V12_10_BASE, 'YouTubeRelease')
V12_17_BASE = os.path.join(BASE, 'youtube.android_12.17')
V12_17_PREFIX = os.path.join(V12_17_BASE, 'YouTubeRelease')
+V12_22_BASE = os.path.join(BASE, 'youtube.android_12.22')
+V12_22_PREFIX = os.path.join(V12_22_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 = os.path.join(THIRD_PARTY, 'android_jar', 'lib-v25', 'android.jar')
VERSIONS = {
- '11.47': {
- 'dex' : {
- 'inputs': [os.path.join(V11_47_BASE, 'YouTubeRelease_unsigned.apk')],
- 'pgmap': '%s_proguard.map' % V11_47_PREFIX,
- 'libraries' : [ANDROID_JAR],
- 'r8-flags': '--ignore-missing-classes',
- },
- 'deploy' : {
- 'inputs': ['%s_deploy.jar' % V11_47_PREFIX],
- 'pgconf': ['%s_proguard.config' % V11_47_PREFIX,
- '%s/proguardsettings/YouTubeRelease_proguard.config' % THIRD_PARTY],
- },
- 'proguarded' : {
- 'inputs': ['%s_proguard.jar' % V11_47_PREFIX],
- 'pgmap': '%s_proguard.map' % V11_47_PREFIX
- }
- },
'12.10': {
'dex' : {
'inputs': [os.path.join(V12_10_BASE, 'YouTubeRelease_unsigned.apk')],
@@ -74,4 +57,21 @@
'pgmap': '%s_proguard.map' % V12_17_PREFIX
}
},
+ '12.22': {
+ 'dex' : {
+ 'inputs': [os.path.join(V12_22_BASE, 'YouTubeRelease_unsigned.apk')],
+ 'pgmap': '%s_proguard.map' % V12_22_PREFIX,
+ 'libraries' : [ANDROID_JAR],
+ 'r8-flags': '--ignore-missing-classes',
+ },
+ 'deploy' : {
+ 'inputs': ['%s_deploy.jar' % V12_22_PREFIX],
+ 'pgconf': ['%s_proguard.config' % V12_22_PREFIX,
+ '%s/proguardsettings/YouTubeRelease_proguard.config' % THIRD_PARTY],
+ },
+ 'proguarded' : {
+ 'inputs': ['%s_proguard.jar' % V12_22_PREFIX],
+ 'pgmap': '%s_proguard.map' % V12_22_PREFIX
+ }
+ },
}
