diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-02-17 02:56:31 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-02-17 02:56:31 +0000 |
| commit | 6e74130254e342a8a83c6b4483867eb5c86f237b (patch) | |
| tree | 03575506fe92950aff7412c0d1770d904dc1326d | |
| parent | 6300f37d91e4ce9a73d4e36fad94a80493d43c94 (diff) | |
| parent | 25317fae42f5aa04b8c1a6ea31bc15804149b0ee (diff) | |
| download | ndk-6e74130254e342a8a83c6b4483867eb5c86f237b.tar.gz | |
Snap for 8191477 from 25317fae42f5aa04b8c1a6ea31bc15804149b0ee to tm-frc-ipsec-release
Change-Id: Ib0fffc9ddc0cc3594d0150d43070a4b39d45c5d0
| -rw-r--r-- | Android.bp | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/Android.bp b/Android.bp index dba243ef7..75a461c5e 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,26 +64,12 @@ 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", } ndk_prebuilt_shared_stl { name: "ndk_libc++_shared", export_include_dirs: libcxx_includes, - multilib: { - lib32: { - export_include_dirs: [ - "current/sources/android/support/include", - ], - }, - } } cc_library_static { |