From c09bf3521f3e3aecbbb10f37aeae02035d7c4891 Mon Sep 17 00:00:00 2001
From: Paul Duffin <paulduffin@google.com>
Date: Wed, 12 Jun 2019 10:52:49 +0100
Subject: [PATCH] Remove superfluous use of no_framework_libs: true

Bug: 134566750
Test: m droid
Change-Id: I6a1fd7e9da27efc56d5ce6be305096adaa8dab41
Merged-In: I2777e8f9da0c7e0f3fc84277600f9db45b2f837e
---
 core/proto/android/server/connectivity/Android.bp | 3 +--
 core/proto/android/stats/connectivity/Android.bp  | 3 +--
 core/proto/android/stats/dnsresolver/Android.bp   | 1 -
 graphics/proto/Android.bp                         | 1 -
 proto/Android.bp                                  | 1 -
 5 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/core/proto/android/server/connectivity/Android.bp b/core/proto/android/server/connectivity/Android.bp
index c0ac2cb8f8005..4136239638515 100644
--- a/core/proto/android/server/connectivity/Android.bp
+++ b/core/proto/android/server/connectivity/Android.bp
@@ -21,5 +21,4 @@ java_library_static {
         "data_stall_event.proto",
     ],
     sdk_version: "system_current",
-    no_framework_libs: true,
-}
\ No newline at end of file
+}
diff --git a/core/proto/android/stats/connectivity/Android.bp b/core/proto/android/stats/connectivity/Android.bp
index 5aa4ddbdf7f96..5d642d3845fee 100644
--- a/core/proto/android/stats/connectivity/Android.bp
+++ b/core/proto/android/stats/connectivity/Android.bp
@@ -21,5 +21,4 @@ java_library_static {
         "network_stack.proto",
     ],
     sdk_version: "system_current",
-    no_framework_libs: true,
-}
\ No newline at end of file
+}
diff --git a/core/proto/android/stats/dnsresolver/Android.bp b/core/proto/android/stats/dnsresolver/Android.bp
index 0b5aa8677a6e8..1e8c763144482 100644
--- a/core/proto/android/stats/dnsresolver/Android.bp
+++ b/core/proto/android/stats/dnsresolver/Android.bp
@@ -21,5 +21,4 @@ java_library_static {
         "dns_resolver.proto",
     ],
     sdk_version: "system_current",
-    no_framework_libs: true,
 }
diff --git a/graphics/proto/Android.bp b/graphics/proto/Android.bp
index 1d06348fb02f8..ddced597759fd 100644
--- a/graphics/proto/Android.bp
+++ b/graphics/proto/Android.bp
@@ -5,7 +5,6 @@ java_library_static {
         type: "lite",
     },
     srcs: ["game_driver.proto"],
-    no_framework_libs: true,
     jarjar_rules: "jarjar-rules.txt",
     sdk_version: "28",
 }
diff --git a/proto/Android.bp b/proto/Android.bp
index e924a4dcd2012..5523c53b4d202 100644
--- a/proto/Android.bp
+++ b/proto/Android.bp
@@ -25,6 +25,5 @@ java_library_static {
         type: "nano",
     },
     srcs: ["src/metrics_constants.proto"],
-    no_framework_libs: true,
     sdk_version: "system_current",
 }