diff options
| author | Colin Cross <ccross@android.com> | 2021-06-16 22:39:22 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-06-16 22:39:22 +0000 |
| commit | 5622a89298068555a81bf11a910c33ad723f37fc (patch) | |
| tree | 68f0f6cded1f8277a11a437e19fcd98097cff187 | |
| parent | fa91e13f76f3f4f269e0c9bbb2c90d1f089d62f2 (diff) | |
| parent | 86851cf950d55bdb10359061de690bd86284aceb (diff) | |
| download | ndk-5622a89298068555a81bf11a910c33ad723f37fc.tar.gz | |
Merge "Move ndk_libandroid_support headers out of libc++" am: 33ad25b59b am: 668e886d4d am: 86851cf950
Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/1736805
Change-Id: I54fc3a6bee8c1e16a3ed179ebe21ca20d5634942
| -rw-r--r-- | Android.bp | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/Android.bp b/Android.bp index dba243ef7..62493b4d0 100644 --- a/Android.bp +++ b/Android.bp @@ -38,10 +38,9 @@ libcxx_includes = [ 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 { 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", } |