commit 02923f9f99adaa155d603b4501fdb9c7cd2be6b9
author Liz Kammer <eakammer@google.com> Wed Mar 10 15:39:01 2021 -0500
committer Liz Kammer <eakammer@google.com> Mon Mar 15 13:19:56 2021 +0000
tree 8ce45444419a51fdcdc9687f1fd2719c66005704
parent 36842909559405e1d2d00190f00465f3bf85db0e

Update min_sdk_version for dcla adbd

dcla compatible apex needs min_sdk_version of S.

Test: build_mainline_modules.sh and verify min_sdk_version
Bug: 180108434
Change-Id: Id4ce1a2dd481e334299cc74250114361eeb8cef5

apex/Android.bp

diff --git a/apex/Android.bp b/apex/Android.bp
index 39f855b..0afd53c 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -10,7 +10,6 @@
 apex_defaults {
     name: "com.android.adbd-defaults",
     updatable: true,
-    min_sdk_version: "30",
 
     binaries: ["adbd"],
     compile_multilib: "both",
@@ -42,9 +41,11 @@
         library_linking_strategy: {
             prefer_static: {
                 manifest: "apex_manifest.json",
+                min_sdk_version: "30",
             },
             conditions_default: {
                 manifest: "apex_manifest_version.json",
+                min_sdk_version: "current",
             },
         },
     },
@@ -63,6 +64,7 @@
     name: "test_com.android.adbd",
     defaults: ["com.android.adbd-defaults"],
     manifest: "test_apex_manifest.json",
+    min_sdk_version: "30",
     file_contexts: ":com.android.adbd-file_contexts",
     installable: false,
 }