From b3e93ccc15698fc1649cb82c5153fb29a7ab438b Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Wed, 22 Apr 2020 15:08:34 +0000
Subject: [PATCH] Revert "Set min_sdk_version to be part of mainline modules"

This reverts commit 3e302d27794cd61db1014010a5a3623cceeb7db1.

Reason for revert: b/154711554

Change-Id: Ie38d43f8936e45f1e4783b28b940a5faacd1772d
---
 apex/sdkextensions/derive_sdk/Android.bp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/apex/sdkextensions/derive_sdk/Android.bp b/apex/sdkextensions/derive_sdk/Android.bp
index c4a00861fe726..c419b51c9b9b9 100644
--- a/apex/sdkextensions/derive_sdk/Android.bp
+++ b/apex/sdkextensions/derive_sdk/Android.bp
@@ -22,11 +22,11 @@ cc_defaults {
         type: "lite",
         static: true,
     },
-    min_sdk_version: "current",
+    sdk_version: "current",
     stl: "c++_static",
-    shared_libs: [
-        "libbase",
-        "liblog",
+    shared_libs: [ "liblog" ],
+    static_libs: [
+        "libbase_ndk",
     ],
 }