diff options
| author | Paul Duffin <paulduffin@google.com> | 2019-06-12 10:52:49 +0100 |
|---|---|---|
| committer | Paul Duffin <paulduffin@google.com> | 2019-06-18 19:21:34 +0100 |
| commit | d93f56542138bdae6ac5af0f667b9ad23118af8c (patch) | |
| tree | 8a4eb89376dcd617014609eccf86091dc07ce2b7 | |
| parent | ed8ff33096d172dcc0e16d293304ebc4662a73f4 (diff) | |
Remove superfluous use of no_framework_libs: true
Bug: 134566750
Test: m droid
Change-Id: I2777e8f9da0c7e0f3fc84277600f9db45b2f837e
Exempt-From-Owner-Approval: no response from owners minor build change
| -rw-r--r-- | core/proto/android/server/connectivity/Android.bp | 3 | ||||
| -rw-r--r-- | core/proto/android/stats/connectivity/Android.bp | 3 | ||||
| -rw-r--r-- | core/proto/android/stats/dnsresolver/Android.bp | 1 | ||||
| -rw-r--r-- | graphics/proto/Android.bp | 1 | ||||
| -rw-r--r-- | media/proto/Android.bp | 1 | ||||
| -rw-r--r-- | proto/Android.bp | 2 |
6 files changed, 2 insertions, 9 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/media/proto/Android.bp b/media/proto/Android.bp index 74fd5255ecd5..2dc0d579c0da 100644 --- 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", } diff --git a/proto/Android.bp b/proto/Android.bp index 7b119a771ba4..65bccbb4aac8 100644 --- 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", } |