diff options
author | Jooyung Han <jooyung@google.com> | 2020-05-20 00:45:27 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-20 00:45:27 +0000 |
commit | f40d9efd7a1f6fcb025bbc5c08d36408353a1d21 (patch) | |
tree | 3c9cc1502c05326ba6f6e27573708fd57a055777 | |
parent | 66ceddf4dcf8637f98f87e2bd515cf2671dcc8ac (diff) | |
parent | 50938ff95b549a169756cdd1d17e97cfce40a201 (diff) | |
download | libcxxabi-f40d9efd7a1f6fcb025bbc5c08d36408353a1d21.tar.gz |
Set min_sdk_version to be part of mainline modules am: 50938ff95bandroid-11.0.0_r16android11-d1-b-release
Change-Id: I443cfde80e6632066e733ba39ec2d69a29cf6552
-rw-r--r-- | Android.bp | 11 |
1 files changed, 8 insertions, 3 deletions
@@ -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", } |