Add missing configuration file to YouTube 15.08
Change-Id: I5f2b159944e1d1e7e4eebb1b11a4517f3d8a4b5a
Bug: 150837881
diff --git a/src/test/java/com/android/tools/r8/internal/YouTubeCompilationBase.java b/src/test/java/com/android/tools/r8/internal/YouTubeCompilationBase.java
index 57f4359..a6dd6b0 100644
--- a/src/test/java/com/android/tools/r8/internal/YouTubeCompilationBase.java
+++ b/src/test/java/com/android/tools/r8/internal/YouTubeCompilationBase.java
@@ -21,6 +21,7 @@
static final String PG_JAR = "YouTubeRelease_proguard.jar";
static final String PG_MAP = "YouTubeRelease_proguard.map";
static final String PG_CONF = "YouTubeRelease_proguard.config";
+ static final String PG_PROTO_CONF = "YouTubeRelease_proto_safety.pgconf";
final String base;
@@ -34,9 +35,14 @@
}
protected List<Path> getKeepRuleFiles() {
- return ImmutableList.of(
- Paths.get(base).resolve(PG_CONF),
- Paths.get(ToolHelper.PROGUARD_SETTINGS_FOR_INTERNAL_APPS).resolve(PG_CONF));
+ ImmutableList.Builder<Path> builder = ImmutableList.builder();
+ builder.add(Paths.get(base).resolve(PG_CONF));
+ builder.add(Paths.get(ToolHelper.PROGUARD_SETTINGS_FOR_INTERNAL_APPS).resolve(PG_CONF));
+ Path config = Paths.get(base).resolve(PG_PROTO_CONF);
+ if (config.toFile().exists()) {
+ builder.add(config);
+ }
+ return builder.build();
}
protected List<Path> getLibraryFiles() {
diff --git a/third_party/youtube/youtube.android_15.08.tar.gz.sha1 b/third_party/youtube/youtube.android_15.08.tar.gz.sha1
index 285c854..357adeb 100644
--- a/third_party/youtube/youtube.android_15.08.tar.gz.sha1
+++ b/third_party/youtube/youtube.android_15.08.tar.gz.sha1
@@ -1 +1 @@
-803d7565c1d56568cfe5d8da18e7fe82bfcac006
\ No newline at end of file
+dc8d9b8f89d9284336897fa4cb2a925ff9e07c67
\ No newline at end of file
diff --git a/tools/youtube_data.py b/tools/youtube_data.py
index e8accdd..226ad4c 100644
--- a/tools/youtube_data.py
+++ b/tools/youtube_data.py
@@ -200,6 +200,7 @@
'libraries' : [os.path.join(V15_08_BASE, 'legacy_YouTubeRelease_combined_library_jars.jar')],
'pgconf': [
'%s_proguard.config' % V15_08_PREFIX,
+ '%s_proto_safety.pgcfg' % V15_08_PREFIX,
'%s/proguardsettings/YouTubeRelease_proguard.config' % utils.THIRD_PARTY],
'proto-shrinking': 1,
'maindexrules' : [
