Set min_sdk_version to be part of mainline modules am: 50938ff95bandroid-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android11-mainline-tethering-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-release

Change-Id: I3b48a45a59973ca2c206ee6a527f22582e9e9ebd

1 files changed, 8 insertions, 3 deletions

diff --git a/Android.bp b/Android.bp
index 56a2832..856b2d1 100644
--- a/Android.bp
+++ b/Android.bp
@@ -21,7 +21,7 @@ cc_defaults {
     recovery_available: true,
     native_bridge_supported: true,
     include_dirs: ["external/libcxx/include"],
-    local_include_dirs:  ["include"],
+    local_include_dirs: ["include"],
     export_include_dirs: ["include"],
     cflags: [
         "-Wall",
@@ -51,6 +51,7 @@ cc_library_static {
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
+    min_sdk_version: "apex_inherit",
 }
 
 cc_library_static {
@@ -108,7 +109,10 @@ cc_library_static {
         darwin: {
             // libcxxabi really doesn't like the non-LLVM assembler on Darwin
             asflags: ["-integrated-as"],
-            cflags: ["-integrated-as", "-D_LIBCPP_DISABLE_AVAILABILITY"],
+            cflags: [
+                "-integrated-as",
+                "-D_LIBCPP_DISABLE_AVAILABILITY",
+            ],
             cppflags: ["-integrated-as"],
         },
         linux_bionic: {
@@ -138,10 +142,11 @@ cc_library_static {
             cppflags: [
                 "-fsjlj-exceptions",
             ],
-        }
+        },
     },
     apex_available: [
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
+    min_sdk_version: "apex_inherit",
 }