summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJooyung Han <jooyung@google.com>2020-04-16 18:48:28 +0900
committerJooyung Han <jooyung@google.com>2020-05-11 17:10:40 +0900
commit50938ff95b549a169756cdd1d17e97cfce40a201 (patch)
tree3c9cc1502c05326ba6f6e27573708fd57a055777
parent6a27edcc373dd6d18ae55b09e1082192b71d72a6 (diff)
downloadlibcxxabi-android11-dev.tar.gz
Set min_sdk_version to be part of mainline modulesandroid11-dev
Modules contributing mainline modules (APK/APEX) should set min_sdk_version as well as apex_available. "apex_inherit" is a special alias to represent "the minimum of all that the apexes require". For now setting min_sdk_version doesn't change build outputs. But build-time checks will be added soon. Bug: 152655956 Test: m Merged-In: I3415af31f0d67e2e4c1fc5b7fdd188d6686ad535 Change-Id: I3415af31f0d67e2e4c1fc5b7fdd188d6686ad535 (cherry picked from commit 8e992d772f381c0617654dd6b4f1a5ca6c3a8c11)
-rw-r--r--Android.bp11
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",
}