Merge "Remove superfluous use of no_framework_libs: true" into qt-dev-plus-aosp am: 6ac0ab0d15

am: 0347191944

Change-Id: I9a4925755505ac25cb8d410bbd4d026453d64175

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,
-}
+}

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,
-}
+}

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

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

media/proto/Android.bp

@@ -5,7 +5,6 @@ java_library_static {
         type: "lite",
     },
     srcs: ["mediaplayer2.proto"],
-    no_framework_libs: true,
     jarjar_rules: "jarjar-rules.txt",
     sdk_version: "28",
 }

proto/Android.bp

@@ -5,7 +5,6 @@ java_library_static {
         type: "nano",
     },
     srcs: ["src/**/*.proto"],
-    no_framework_libs: true,
     sdk_version: "9",
     // Pin java_version until jarjar is certified to support later versions. http://b/72703434
     java_version: "1.8",
@@ -26,6 +25,5 @@ java_library_static {
         type: "nano",
     },
     srcs: ["src/metrics_constants/metrics_constants.proto"],
-    no_framework_libs: true,
     sdk_version: "system_current",
 }