commit 48e41b74f9a8cfe829f7f0c9636d0529ce7cf6c3
author Treehugger Robot <treehugger-gerrit@google.com> Tue Jan 09 02:38:05 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 09 02:38:05 2018 +0000
tree 29c8f82f01845dbfdeab229d83f4103e9b3c6a72
parent 5a436f10e525296f990ac4146e317f5fd5d7f271
parent 1759e2d2f126dab383dc5f6d781cf784fd8a1cfb

Merge "Fix allowed STL types for system libraries."

core/allowed_ndk_types.mk

diff --git a/core/allowed_ndk_types.mk b/core/allowed_ndk_types.mk
index b5a85ca..3d7eac4 100644
--- a/core/allowed_ndk_types.mk
+++ b/core/allowed_ndk_types.mk
@@ -79,7 +79,11 @@
     # 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