openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Disallow LOCAL_CXX_STL with LOCAL_SDK_VERSION."

This commit is contained in:
Dan Albert 2015-07-28 00:04:36 +00:00 committed by Gerrit Code Review
parent b1c0a86f7a ef3e7cfa5d
commit d4ff228319
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/cxx_stl_setup.mk
View File

@ -24,6 +24,18 @@ ifeq ($(strip $(LOCAL_CXX_STL)),default)
endif endif
else else
my_cxx_stl := $(strip $(LOCAL_CXX_STL)) my_cxx_stl := $(strip $(LOCAL_CXX_STL))
ifdef LOCAL_SDK_VERSION
# The NDK has historically used LOCAL_NDK_STL_VARIANT to specify the
# STL. An Android.mk that specifies both LOCAL_CXX_STL and
# LOCAL_SDK_VERSION will incorrectly try (and most likely fail) to use
# the platform STL in an NDK binary. Emit an error to direct the user
# toward the correct option.
#
# Note that we could also accept LOCAL_CXX_STL as an alias for
# LOCAL_NDK_STL_VARIANT (and in fact soong does use the same name), but
# the two options use different names for the STLs.
$(error $(LOCAL_PATH): $(LOCAL_MODULE): Must use LOCAL_NDK_STL_VARIANT rather than LOCAL_CXX_STL for NDK binaries)
endif
endif endif
# Yes, this is actually what the clang driver does. # Yes, this is actually what the clang driver does.