Snap for 4647811 from 68349a8634db3a240a19b72aea99176bc5260e29 to pi-release

Change-Id: Iaba48150d0db19bf1bfe303f563ecb7744fb7a1e

3 files changed, 13 insertions, 2 deletions

diff --git a/BUILD.gn b/BUILD.gn
index 6f08b1d..bc1fcb3 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -7,15 +7,17 @@ import("//build/config/android/rules.gni")
 
 android_library("boundary_interface_java") {
   java_files = [
-    "src/org/chromium/support_lib_boundary/BoundaryInterfaceReflectionUtil.java",
     "src/org/chromium/support_lib_boundary/StaticsBoundaryInterface.java",
     "src/org/chromium/support_lib_boundary/VisualStateCallbackBoundaryInterface.java",
     "src/org/chromium/support_lib_boundary/WebSettingsBoundaryInterface.java",
     "src/org/chromium/support_lib_boundary/WebViewProviderBoundaryInterface.java",
     "src/org/chromium/support_lib_boundary/WebViewProviderFactoryBoundaryInterface.java",
     "src/org/chromium/support_lib_boundary/WebkitToCompatConverterBoundaryInterface.java",
+    "src/org/chromium/support_lib_boundary/util/BoundaryInterfaceReflectionUtil.java",
   ]
 
+  proguard_configs = [ "proguard.flags" ]
+
   # We can't use ANY deps here, the support library should be able to build
   # these interfaces without any other chromium dependencies.
   deps = []
diff --git a/proguard.flags b/proguard.flags
new file mode 100644
index 0000000..4a0d580
--- /dev/null
+++ b/proguard.flags
@@ -0,0 +1,9 @@
+# Copyright 2018 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# We need to avoid obfuscating the support library boundary interface because
+# this API is shared with the Android Support Library.
+# Note that we only 'keep' the package org.chromium.support_lib_boundary itself,
+# any sub-packages of that package can still be obfuscated.
+-keep public class org.chromium.support_lib_boundary.* { public *; }
diff --git a/src/org/chromium/support_lib_boundary/BoundaryInterfaceReflectionUtil.java b/src/org/chromium/support_lib_boundary/util/BoundaryInterfaceReflectionUtil.java
index caf7277..5a772c5 100644
--- a/src/org/chromium/support_lib_boundary/BoundaryInterfaceReflectionUtil.java
+++ b/src/org/chromium/support_lib_boundary/util/BoundaryInterfaceReflectionUtil.java
@@ -1,7 +1,7 @@
 // Copyright 2018 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-package org.chromium.support_lib_boundary;
+package org.chromium.support_lib_boundary.util;
 
 import android.annotation.TargetApi;
 import android.os.Build;