From 559889f192ea541b2f43120b103fb068f5f3542d Mon Sep 17 00:00:00 2001
From: Jooyung Han <jooyung@google.com>
Date: Fri, 24 Jun 2022 14:56:23 +0900
Subject: [PATCH] Set min_sdk_version

This was done via the hard-coded list in build/soong.

Bug: 158059172
Test: m
Merged-In: Ie6dc1f59b459ec01605d796a4d81be04bc1d07da
Change-Id: Ie6dc1f59b459ec01605d796a4d81be04bc1d07da
(cherry picked from commit 792546455e9d722d3f0cb49327d58ea59559d573)
---
 Android.bp                | 1 +
 libs/protoutil/Android.bp | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Android.bp b/Android.bp
index 034aea2ee4a42..d8848029af3e5 100644
--- a/Android.bp
+++ b/Android.bp
@@ -305,6 +305,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 132d71eb6db8c..128be3c33ac56 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",
-    }
+    },
 }