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

2019-06-18 21:30:31 +00:00
parent 528ce069dc d93f565421
commit 6ac0ab0d15
6 changed files with 2 additions and 9 deletions
--- 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,
-}
+}
--- 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,
-}
+}
--- 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,
 }
--- 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",
 }
--- a/media/proto/Android.bp
+++ b/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",
 }
--- a/proto/Android.bp
+++ b/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",
 }