Merge "Set min_sdk_version" into tm-dev-plus-aosp

2022-06-28 23:52:40 +00:00
parent 2292d20d39 792546455e
commit aeba7f5e8f
2 changed files with 3 additions and 1 deletions
--- 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",
--- 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",
-    }
+    },
 }