commit e3c7223a009074e8d6b57d56757851ede7d8ab07
author Jooyung Han <jooyung@google.com> Wed May 20 01:00:22 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed May 20 01:00:22 2020 +0000
tree 3c9cc1502c05326ba6f6e27573708fd57a055777
parent 78c0593f667270754bb1ba3336012328a9dea227
parent f40d9efd7a1f6fcb025bbc5c08d36408353a1d21

Set min_sdk_version to be part of mainline modules am: 50938ff95b am: f40d9efd7a

Change-Id: I7d1ec72d3a8aa487d57f8fce56f8b36821b7e925

Android.bp

diff --git a/Android.bp b/Android.bp
index 56a2832..856b2d1 100644
--- a/Android.bp
+++ b/Android.bp
@@ -21,7 +21,7 @@
     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 @@
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
+    min_sdk_version: "apex_inherit",
 }
 
 cc_library_static {
@@ -108,7 +109,10 @@
         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 @@
             cppflags: [
                 "-fsjlj-exceptions",
             ],
-        }
+        },
     },
     apex_available: [
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
+    min_sdk_version: "apex_inherit",
 }