summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2022-07-04 14:01:19 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2022-07-04 14:01:19 +0000
commit8fe47dd0b83c2531793ebbef0935c57c15d95908 (patch)
tree729ddfe367c7a20aa8c17262bc7e95576679bdda
parent7d21782d90551a4791607cf6cb9bf597d0ba486a (diff)
parent907d7169f0121c869018879a5b0080e722f0025d (diff)
Merge "Set min_sdk_version"
-rw-r--r--Android.bp1
-rw-r--r--libs/protoutil/Android.bp3
2 files changed, 3 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
index b0a1f93acd97..287f271be384 100644
--- a/Android.bp
+++ b/Android.bp
@@ -298,6 +298,7 @@ java_defaults {
"contacts-provider-platform-compat-config",
],
libs: [
+ "androidx.annotation_annotation",
"app-compat-annotations",
"ext",
"framework-updatable-stubs-module_libs_api",
diff --git a/libs/protoutil/Android.bp b/libs/protoutil/Android.bp
index 132d71eb6db8..128be3c33ac5 100644
--- a/libs/protoutil/Android.bp
+++ b/libs/protoutil/Android.bp
@@ -55,6 +55,7 @@ cc_library {
export_include_dirs: ["include"],
+ min_sdk_version: "30",
apex_available: [
"//apex_available:platform",
"com.android.os.statsd",
@@ -81,5 +82,5 @@ cc_test {
proto: {
type: "full",
- }
+ },
}