aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2019-01-13 04:15:24 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2019-01-13 04:15:24 +0000
commit34997254892f04ec0d1cfa2e8948155e99c292ff (patch)
tree24e87784ac9a003039544dbebf1d89b7bad0f977
parentf11ba899d5c04b2e0445e0b47cbf26d89ced4f7d (diff)
parent3173e4c2b9cd6e005002a8a8baea27298f959345 (diff)
downloadplatform_external_openssh-34997254892f04ec0d1cfa2e8948155e99c292ff.tar.gz
platform_external_openssh-34997254892f04ec0d1cfa2e8948155e99c292ff.tar.bz2
platform_external_openssh-34997254892f04ec0d1cfa2e8948155e99c292ff.zip
Snap for 5228332 from 3173e4c2b9cd6e005002a8a8baea27298f959345 to qt-release
Change-Id: If5a1cdc13379a159d676f3ec1966d9d9dd80f9dd
-rw-r--r--Android.mk9
1 files changed, 9 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index 355f64c5..129f719c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -295,6 +295,15 @@ LOCAL_C_INCLUDES := \
LOCAL_SHARED_LIBRARIES += libssh libssl libcrypto libdl libz libcutils
+# libc.bootstrap is available/required since Q
+ifneq ($(PLATFORM_VERSION_CODENAME)|$(call math_lt,$(PLATFORM_SDK_VERSION),29),REL|true)
+# This filter is for old branches that does not have math_lt macro
+# This is equivalently PLATFORM_SDK_VERSION > 27
+ifeq ($(filter 14 15 16 17 18 19 20 21 22 23 24 25 26 27,$(PLATFORM_SDK_VERSION)),)
+LOCAL_SHARED_LIBRARIES += libc.bootstrap
+endif
+endif
+
include $(BUILD_EXECUTABLE)
###################### ssh-keygen ######################