commit 86851cf950d55bdb10359061de690bd86284aceb
author Colin Cross <ccross@android.com> Wed Jun 16 22:21:38 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jun 16 22:21:38 2021 +0000
tree 68f0f6cded1f8277a11a437e19fcd98097cff187
parent fa91e13f76f3f4f269e0c9bbb2c90d1f089d62f2
parent 668e886d4d047734f73b979fe08281bfea1bdd63

Merge "Move ndk_libandroid_support headers out of libc++" am: 33ad25b59b am: 668e886d4d

Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/1736805

Change-Id: I1dbeafd01a1dae4f9891a93f6ccf7b37b8a8df52

Android.bp

diff --git a/Android.bp b/Android.bp
index dba243e..62493b4 100644
--- a/Android.bp
+++ b/Android.bp
@@ -38,10 +38,9 @@
 
 ndk_prebuilt_static_stl {
     name: "ndk_libandroid_support",
-    // 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).
+    export_include_dirs: [
+        "current/sources/android/support/include",
+    ],
     arch: {
         arm64: {
             enabled: false,
@@ -65,13 +64,6 @@
 ndk_prebuilt_static_stl {
     name: "ndk_libc++_static",
     export_include_dirs: libcxx_includes,
-    multilib: {
-        lib32: {
-            export_include_dirs: [
-                "current/sources/android/support/include",
-            ],
-        },
-    },
     min_sdk_version: "16",
 }