Add YouTube version 14.19
Change-Id: Ie479d313f82a399fe02f8059c4e24fbe19e8e210
diff --git a/build.gradle b/build.gradle
index f9e5f2d..d66d786 100644
--- a/build.gradle
+++ b/build.gradle
@@ -383,6 +383,7 @@
"youtube/youtube.android_12.17",
"youtube/youtube.android_12.22",
"youtube/youtube.android_13.37",
+ "youtube/youtube.android_14_19"
],
]
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 c816928..f5da927 100644
--- a/src/main/java/com/android/tools/r8/shaking/ProguardConfigurationParser.java
+++ b/src/main/java/com/android/tools/r8/shaking/ProguardConfigurationParser.java
@@ -53,7 +53,8 @@
private static final List<String> IGNORED_SINGLE_ARG_OPTIONS = ImmutableList.of(
"protomapping",
- "target");
+ "target",
+ "maximuminlinedcodelength");
private static final List<String> IGNORED_OPTIONAL_SINGLE_ARG_OPTIONS = ImmutableList.of(
"runtype",
@@ -72,7 +73,9 @@
"mergeinterfacesaggressively",
"android",
"shrinkunusedprotofields",
- "allowruntypeandignoreoptimizationpasses");
+ "allowruntypeandignoreoptimizationpasses",
+ "dontshrinkduringoptimization",
+ "convert_proto_enum_to_string");
private static final List<String> IGNORED_CLASS_DESCRIPTOR_OPTIONS = ImmutableList.of(
"isclassnamestring",
diff --git a/third_party/youtube/youtube.android_14.19.tar.gz.sha1 b/third_party/youtube/youtube.android_14.19.tar.gz.sha1
new file mode 100644
index 0000000..eee098b
--- /dev/null
+++ b/third_party/youtube/youtube.android_14.19.tar.gz.sha1
@@ -0,0 +1 @@
+32d92330cfa672f687f80969bb6eeb5af5b9bd01
\ No newline at end of file
diff --git a/tools/youtube_data.py b/tools/youtube_data.py
index f2b1772..f26af8d 100644
--- a/tools/youtube_data.py
+++ b/tools/youtube_data.py
@@ -21,6 +21,9 @@
V13_37_BASE = os.path.join(BASE, 'youtube.android_13.37')
V13_37_PREFIX = os.path.join(V13_37_BASE, 'YouTubeRelease')
+V14_19_BASE = os.path.join(BASE, 'youtube.android_14.19')
+V14_19_PREFIX = os.path.join(V14_19_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)
@@ -116,4 +119,30 @@
'min-api' : ANDROID_L_API,
}
},
+ '14.19': {
+ 'dex' : {
+ 'inputs': [os.path.join(V14_19_BASE, 'YouTubeRelease_unsigned.apk')],
+ 'pgmap': '%s_proguard.map' % V14_19_PREFIX,
+ 'libraries' : [ANDROID_JAR],
+ 'min-api' : ANDROID_L_API,
+ },
+ 'deploy' : {
+ 'inputs': ['%s_deploy.jar' % V14_19_PREFIX],
+ 'pgconf': [
+ '%s_proguard.config' % V14_19_PREFIX,
+ '%s/proguardsettings/YouTubeRelease_proguard.config' % utils.THIRD_PARTY],
+ # Build for native multi dex, as Currently R8 cannot meet the main-dex
+ # constraints.
+ #'maindexrules' : [
+ # os.path.join(V14_19_BASE, 'mainDexClasses.rules'),
+ # os.path.join(V14_19_BASE, 'main-dex-classes-release-optimized.cfg'),
+ # os.path.join(V14_19_BASE, 'main_dex_YouTubeRelease_proguard.cfg')],
+ 'min-api' : ANDROID_L_API,
+ },
+ 'proguarded' : {
+ 'inputs': ['%s_proguard.jar' % V14_19_PREFIX],
+ 'pgmap': '%s_proguard.map' % V14_19_PREFIX,
+ 'min-api' : ANDROID_L_API,
+ }
+ },
}
