commit e34896af249ffc116b18e1ceddb9658473fc6a8f
author Chiachang Wang <chiachangwang@google.com> Thu Feb 21 03:54:53 2019 -0800
committer android-build-merger <android-build-merger@google.com> Thu Feb 21 03:54:53 2019 -0800
tree e14ca8c3c72abc737b29744dcfb3abf983690439
parent f7b3bdb53bab9dfee3bcbba500f3f538cb00a737
parent fc0708615c28eaa48bdbb6bf259463a086ce1517

Merge "Fix build warnings for CaptivePortalLogin"
am: fc0708615c

Change-Id: I96043c23bf3861c958ffd014e450728b665680e6

proto/Android.bp

diff --git a/proto/Android.bp b/proto/Android.bp
index 9b7a1c1..e924a4d 100644
--- a/proto/Android.bp
+++ b/proto/Android.bp
@@ -27,14 +27,4 @@
     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"],
-        },
-    },
 }