From: Chiachang Wang <chiachangwang@google.com>
Date: Thu, 21 Feb 2019 06:00:59 +0000 (+0800)
Subject: Fix build warnings for CaptivePortalLogin
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c6610acf820b6795d7bf17ed897692033337ed24;p=android-x86%2Fframeworks-base.git

Fix build warnings for CaptivePortalLogin

CaptivePortalLogin needs only the defintion in
metrics_constants.proto. This will not need the jarjar_rules.
Thus, remove the unnecessary rule to fix the build warning.

Test: make CaptivePortalLogin and no warning
Bug: 123717273
Change-Id: I5bb3ee61be769989d02a2762a7747d4dafd7bd71
---

diff --git a/proto/Android.bp b/proto/Android.bp
index 9b7a1c15cf97..e924a4dcd201 100644
--- a/proto/Android.bp
+++ b/proto/Android.bp
@@ -27,14 +27,4 @@ java_library_static {
     srcs: ["src/metrics_constants.proto"],
     no_framework_libs: true,
     sdk_version: "system_current",
-    // Pin java_version until jarjar is certified to support later versions. http://b/72703434
-    java_version: "1.8",
-    target: {
-        android: {
-            jarjar_rules: "jarjar-rules.txt",
-        },
-        host: {
-            static_libs: ["libprotobuf-java-nano"],
-        },
-    },
 }