commit 60b0fc59e9ee27b1063ceefcac55e3c01b7fe65b
author Dan Albert <danalbert@google.com> Thu Jan 23 16:32:36 2020 -0800
committer Elliott Hughes <enh@google.com> Fri Jan 24 00:39:44 2020 +0000
tree c1a3a908dbde9938c040aab61c82bfc8487ab8a3
parent 878a55981d45148b94e7c13a4fa99283fc5b72c8

Fix include order of libandroid_support.

Not sure why this worked before, but it causes build breaks with r21.

Test: treehugger
Bug: None
Change-Id: I9d1d22cb4f8af01c24a2e29b4c7f8a6f827848e2

stl.bp

diff --git a/stl.bp b/stl.bp
index 0e628ba..5f93f70 100644
--- a/stl.bp
+++ b/stl.bp
@@ -5,9 +5,10 @@
 
 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 {
     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",
+            ],
+        },
+    }
 }