diff options
author | Alexander Dorokhine <adorokhine@google.com> | 2022-03-09 20:49:26 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2022-03-09 20:49:26 +0000 |
commit | 9cb1d5d4a52b17b8c9ad4e6dd359c3498edbd0fb (patch) | |
tree | ad077e6ef9a2b988e89421a7b01903f6f7d3be94 | |
parent | bb148050e7f2df660e55eb9523b54567d779cb2e (diff) | |
parent | 72d6d7ce4007c0eb552f39fa87e1a2b9bca86fb8 (diff) | |
download | icing-9cb1d5d4a52b17b8c9ad4e6dd359c3498edbd0fb.tar.gz |
Merge "Add min_sdk_version rules to allow building as an updatable apex." into tm-dev
-rw-r--r-- | Android.bp | 1 | ||||
-rw-r--r-- | java/Android.bp | 1 | ||||
-rw-r--r-- | proto/Android.bp | 1 |
3 files changed, 3 insertions, 0 deletions
@@ -88,6 +88,7 @@ cc_library_shared { "libz", ], version_script: "icing/jni.lds", + min_sdk_version: "Tiramisu", } // TODO(cassiewang): Add build rules and a TEST_MAPPING for cc_tests diff --git a/java/Android.bp b/java/Android.bp index ef417ba..6133230 100644 --- a/java/Android.bp +++ b/java/Android.bp @@ -32,5 +32,6 @@ java_library { "androidx.annotation_annotation", ], sdk_version: "current", + min_sdk_version: "Tiramisu", apex_available: ["com.android.appsearch"], } diff --git a/proto/Android.bp b/proto/Android.bp index 4fb0c18..cda0ec2 100644 --- a/proto/Android.bp +++ b/proto/Android.bp @@ -43,4 +43,5 @@ cc_library_static { export_proto_headers: true, }, srcs: ["icing/**/*.proto"], + min_sdk_version: "Tiramisu", } |