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

Merge "Fix allowed STL types for system libraries." am: 48e41b74f9 

am: f125a492e7

Change-Id: Ifc6a50e9f209cf15d001438889b9129275d771e9
This commit is contained in:
Dan Albert 2018-01-09 05:07:06 +00:00 committed by android-build-merger
parent 001396ba85 f125a492e7
commit 03ac235e79
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/allowed_ndk_types.mk
View File

@ -79,7 +79,11 @@ ifdef LOCAL_SDK_VERSION
# Else we are a non-static library that uses a static STL, and are # Else we are a non-static library that uses a static STL, and are
# incompatible with all other shared libraries that use an STL. # incompatible with all other shared libraries that use an STL.
else else
my_allowed_ndk_types := native:ndk:none:none native:ndk:system:shared my_allowed_ndk_types := \
native:ndk:none:none \
native:ndk:system:none \
native:ndk:system:shared \
ifeq ($(LOCAL_MODULE_CLASS),APPS) ifeq ($(LOCAL_MODULE_CLASS),APPS)
# CTS is bad and it should feel bad: http://b/13249737 # CTS is bad and it should feel bad: http://b/13249737
my_warn_ndk_types += native:ndk:libc++:static my_warn_ndk_types += native:ndk:libc++:static