Merge "Fix include order of libandroid_support." am: 0e4bd14fba am: 223d393ce5 am: 7651bf4758

Change-Id: I38887e0242d3831161a24a4c93e13bcf66a3d138

1 files changed, 18 insertions, 3 deletions

diff --git a/stl.bp b/stl.bp
index 0e628badd..5f93f7027 100644
--- a/stl.bp
+++ b/stl.bp
@@ -5,9 +5,10 @@ libcxx_includes =  [
 
 ndk_prebuilt_static_stl {
     name: "ndk_libandroid_support",
-    export_include_dirs: [
-        "current/sources/android/support/include",
-    ],
+    // libandroid_support headers are exported by libc++ rather than by
+    // libandroid_support itself because it's the only way we can enforce the
+    // correct ordering of the includes (libc++ first, libandroid_support
+    // second).
     arch: {
         arm64: {
             enabled: false,
@@ -36,9 +37,23 @@ ndk_prebuilt_static_stl {
 ndk_prebuilt_static_stl {
     name: "ndk_libc++_static",
     export_include_dirs: libcxx_includes,
+    multilib: {
+        lib32: {
+            export_include_dirs: [
+                "current/sources/android/support/include",
+            ],
+        },
+    }
 }
 
 ndk_prebuilt_shared_stl {
     name: "ndk_libc++_shared",
     export_include_dirs: libcxx_includes,
+    multilib: {
+        lib32: {
+            export_include_dirs: [
+                "current/sources/android/support/include",
+            ],
+        },
+    }
 }