Merge "Fix build warnings for CaptivePortalLogin" am: fc0708615c

am: e34896af24 Change-Id: Id5ae42f19bb947aea1835dac460b030fad979422
2019-02-25 08:33:52 -08:00
parent 24f953a6c2 e34896af24
commit c11968e1c0
1 changed files with 0 additions and 10 deletions
--- 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"],
-        },
-    },
 }