commit b751443fdcf437ba84718ad00a9245ac8dfef1ef
author Paul Duffin <paulduffin@google.com> Thu Feb 21 13:21:54 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Feb 21 13:21:54 2019 +0000
tree 488a0a88afe20263ffc55bc0fe75c7a0fe48a8ef
parent fc0708615c28eaa48bdbb6bf259463a086ce1517
parent fab8754054e3a87600bb490d1d0cc81b1eb092c9

Merge "Allow framework-atb-backward-compatibility to be added to bootclasspath"

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"],
-        },
-    },
 }