From 78e7bbc3c34bb85ecc9a912929e8b3b224973b05 Mon Sep 17 00:00:00 2001
From: Eugene Kliuchnikov <eustas@google.com>
Date: Fri, 3 May 2019 11:51:11 +0200
Subject: Update (#753)

 * fix executable mode of decode.js
 * explain clang-analyser about non-nullability
 * fix "dead assignment"
 * rename proguard.cfg -> proguard.pgcfg
---
 java/org/brotli/dec/BUILD          | 2 +-
 java/org/brotli/dec/proguard.cfg   | 6 ------
 java/org/brotli/dec/proguard.pgcfg | 6 ++++++
 3 files changed, 7 insertions(+), 7 deletions(-)
 delete mode 100644 java/org/brotli/dec/proguard.cfg
 create mode 100644 java/org/brotli/dec/proguard.pgcfg

(limited to 'java')

diff --git a/java/org/brotli/dec/BUILD b/java/org/brotli/dec/BUILD
index 8c61fe7..f17e512 100644
--- a/java/org/brotli/dec/BUILD
+++ b/java/org/brotli/dec/BUILD
@@ -16,7 +16,7 @@ java_library(
         ["*.java"],
         exclude = ["*Test*.java"],
     ),
-    proguard_specs = ["proguard.cfg"],
+    proguard_specs = ["proguard.pgcfg"],
 )
 
 load(":build_defs.bzl", "brotli_java_test")
diff --git a/java/org/brotli/dec/proguard.cfg b/java/org/brotli/dec/proguard.cfg
deleted file mode 100644
index 4c545dc..0000000
--- a/java/org/brotli/dec/proguard.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-# DictionaryData is an optionally / dynamically loaded built-in dictionary.
--keep class org.brotli.dec.DictionaryData
-
-# We get the fully-qualified name of DictionaryData from Dictionary, so avoid
-# renaming it.
--keepnames class org.brotli.dec.Dictionary
diff --git a/java/org/brotli/dec/proguard.pgcfg b/java/org/brotli/dec/proguard.pgcfg
new file mode 100644
index 0000000..4c545dc
--- /dev/null
+++ b/java/org/brotli/dec/proguard.pgcfg
@@ -0,0 +1,6 @@
+# DictionaryData is an optionally / dynamically loaded built-in dictionary.
+-keep class org.brotli.dec.DictionaryData
+
+# We get the fully-qualified name of DictionaryData from Dictionary, so avoid
+# renaming it.
+-keepnames class org.brotli.dec.Dictionary
-- 
cgit v1.1