From 4f49b2a2898531669e9268d010ee054471797891 Mon Sep 17 00:00:00 2001
From: Jooyung Han <jooyung@google.com>
Date: Thu, 23 Apr 2020 15:25:04 +0900
Subject: [PATCH] derive_sdk: set min_sdk_version

Modules contributing mainline modules (APK/APEX) should set
min_sdk_version as well as apex_available.

Removed sdk_version because the sdk variant is not used by sdkext apex.
And, changed the dep from libbase_ndk to libbase. libbinder_ndk would
still work. But there's no reason to use it if not set sdk_version.

We could've set "sdk_variant_only" so that sdkext apex use the sdk
variant of derive_sdk explicitly. But even if we do that, we still have
to set min_sdk_version to be used by the apexes anyway.

Bug: 145796956
Test: m
Change-Id: I94ad8b9ffc5088822d3365253bf2f005a659d923
---
 apex/sdkextensions/derive_sdk/Android.bp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

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