commit c2660c711e205a67bcaa677297aee9ef866e358c
author Chiachang Wang <chiachangwang@google.com> Mon Feb 25 09:03:06 2019 -0800
committer android-build-merger <android-build-merger@google.com> Mon Feb 25 09:03:06 2019 -0800
tree 5b8629738e30a2eaa00baafc2c8350f8882e27ac
parent d138be09df9ca0bca35b11c054e6bfc11b14de71
parent c11968e1c082230c002475a5f390bae4deb563a5

Merge "Fix build warnings for CaptivePortalLogin" am: fc0708615c am: e34896af24
am: c11968e1c0

Change-Id: I99e79b9e94d511f1e5267c5125f98c3a9fb51506

proto/Android.bp

diff --git a/proto/Android.bp b/proto/Android.bp
index 7f826b3..7b119a7 100644
--- a/proto/Android.bp
+++ b/proto/Android.bp
@@ -28,14 +28,4 @@
     srcs: ["src/metrics_constants/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"],
-        },
-    },
 }