Add YouTube 15.33 to run_on_app.py
Change-Id: Id9d8f256a3c68061ec716f4c53b80b545a94a160
diff --git a/build.gradle b/build.gradle
index 7e42ea1..2e2132d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -438,7 +438,8 @@
"youtube/youtube.android_14.19",
"youtube/youtube.android_14.44",
"youtube/youtube.android_15.08",
- "youtube/youtube.android_15.09"
+ "youtube/youtube.android_15.09",
+ "youtube/youtube.android_15.33"
],
]
diff --git a/src/main/java/com/android/tools/r8/shaking/ProguardConfigurationParser.java b/src/main/java/com/android/tools/r8/shaking/ProguardConfigurationParser.java
index 58bbdae..1b51a73 100644
--- a/src/main/java/com/android/tools/r8/shaking/ProguardConfigurationParser.java
+++ b/src/main/java/com/android/tools/r8/shaking/ProguardConfigurationParser.java
@@ -74,9 +74,8 @@
"dontshrinkduringoptimization",
"convert_proto_enum_to_string");
- private static final List<String> IGNORED_CLASS_DESCRIPTOR_OPTIONS = ImmutableList.of(
- "isclassnamestring",
- "whyarenotsimple");
+ private static final List<String> IGNORED_CLASS_DESCRIPTOR_OPTIONS =
+ ImmutableList.of("isclassnamestring", "whyarenotsimple", "convertchecknotnull");
private static final List<String> WARNED_SINGLE_ARG_OPTIONS = ImmutableList.of(
// TODO(b/37137994): -outjars should be reported as errors, not just as warnings!
diff --git a/third_party/youtube/youtube.android_15.33.tar.gz.sha1 b/third_party/youtube/youtube.android_15.33.tar.gz.sha1
new file mode 100644
index 0000000..3ce1c4a
--- /dev/null
+++ b/third_party/youtube/youtube.android_15.33.tar.gz.sha1
@@ -0,0 +1 @@
+cdff350c62bf8c72d97be51590e90ad9105b5499
\ No newline at end of file
diff --git a/tools/youtube_data.py b/tools/youtube_data.py
index 828e04b..46b0b9d 100644
--- a/tools/youtube_data.py
+++ b/tools/youtube_data.py
@@ -34,6 +34,9 @@
V15_09_BASE = os.path.join(BASE, 'youtube.android_15.09')
V15_09_PREFIX = os.path.join(V15_09_BASE, 'YouTubeRelease')
+V15_33_BASE = os.path.join(BASE, 'youtube.android_15.33')
+V15_33_PREFIX = os.path.join(V15_33_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)
@@ -241,4 +244,34 @@
'min-api' : ANDROID_L_API,
}
},
+ '15.33': {
+ 'dex' : {
+ 'inputs': [os.path.join(V15_33_BASE, 'YouTubeRelease_unsigned.apk')],
+ 'pgmap': '%s_proguard.map' % V15_33_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_33_PREFIX],
+ 'libraries' : [os.path.join(V15_33_BASE, 'legacy_YouTubeRelease_combined_library_jars.jar')],
+ 'pgconf': [
+ '%s_proguard.config' % V15_33_PREFIX,
+ '%s_proguard_missing_classes.config' % V15_33_PREFIX,
+ '%s/proguardsettings/YouTubeRelease_proguard.config' % utils.THIRD_PARTY],
+ 'maindexrules' : [
+ os.path.join(V15_33_BASE, 'mainDexClasses.rules'),
+ os.path.join(V15_33_BASE, 'main-dex-classes-release-optimized.pgcfg'),
+ os.path.join(V15_33_BASE, 'main_dex_YouTubeRelease_proguard.cfg')],
+ 'min-api' : ANDROID_H_MR2_API,
+ },
+ 'proguarded' : {
+ 'inputs': ['%s_proguard.jar' % V15_33_PREFIX],
+ 'pgmap': '%s_proguard.map' % V15_33_PREFIX,
+ 'min-api' : ANDROID_L_API,
+ }
+ },
}
