p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Fix allowed STL types for system libraries." 

am: 48e41b74f9

Change-Id: I96bafdc15ff33f554bb14be73a69e7f670369b46
This commit is contained in:
Dan Albert 2018-01-09 02:42:24 +00:00 committed by android-build-merger
parent 260b272319 48e41b74f9
commit f125a492e7
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
# incompatible with all other shared libraries that use an STL.
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)
# CTS is bad and it should feel bad: http://b/13249737
my_warn_ndk_types += native:ndk:libc++:static