summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Paul Duffin <paulduffin@google.com> 2019-06-19 03:22:07 -0700
committer android-build-merger <android-build-merger@google.com> 2019-06-19 03:22:07 -0700
commitbcf1f88f32480c98002f418a2573a3e3e411ae80 (patch)
tree105ba0d92d0eb81e9d3184e685d4f9d085f59758
parente4b2d05705112294a415c2799f7f6c907b4f6323 (diff)
parentee7baf72cfb7305342854ca92912e322b68e5d0d (diff)
Merge "Remove superfluous use of no_framework_libs: true"
am: ee7baf72cf Change-Id: I044c175d67c4480c39adf00fe69fc8c0b1e62c8c
-rw-r--r--core/proto/android/server/connectivity/Android.bp3
-rw-r--r--core/proto/android/stats/connectivity/Android.bp3
-rw-r--r--core/proto/android/stats/dnsresolver/Android.bp1
-rw-r--r--graphics/proto/Android.bp1
-rw-r--r--proto/Android.bp1
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 c0ac2cb8f800..413623963851 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 5aa4ddbdf7f9..5d642d3845fe 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 0b5aa8677a6e..1e8c76314448 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 1d06348fb02f..ddced597759f 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 e924a4dcd201..5523c53b4d20 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",
}