Snap for 6516196 from f40d9efd7a1f6fcb025bbc5c08d36408353a1d21 to rvc-d1-releaseandroid-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android-11.0.0_r11android-11.0.0_r10android11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-release

Change-Id: I0d66ae72eed635d22c3535a280814421df2a921a

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",
 }