diff options
| -rw-r--r-- | build/core/definitions.mk | 6 | ||||
| -rw-r--r-- | docs/changelogs/Changelog-r21.md | 6 | ||||
| -rw-r--r-- | sources/cxx-stl/system/Android.mk | 9 | ||||
| -rw-r--r-- | sources/cxx-stl/system/setup.mk | 4 |
4 files changed, 10 insertions, 15 deletions
diff --git a/build/core/definitions.mk b/build/core/definitions.mk index dad943adb..ba29d63b1 100644 --- a/build/core/definitions.mk +++ b/build/core/definitions.mk @@ -2106,7 +2106,9 @@ ndk-stl-check = \ # ndk-stl-select = \ $(if $(filter none,$1),,\ - $(call import-module,$(NDK_STL.$1.IMPORT_MODULE)) \ + $(if $(NDK_STL.$1.IMPORT_MODULE),\ + $(call import-module,$(NDK_STL.$1.IMPORT_MODULE)) \ + )\ ) # Called after all Android.mk files are parsed to add @@ -2120,7 +2122,7 @@ ndk-stl-add-dependencies = \ $(NDK_STL.$1.LDLIBS)) $(call ndk-stl-register,none) -$(call ndk-stl-register,system,cxx-stl/system,libstdc++) +$(call ndk-stl-register,system) $(call ndk-stl-register,\ c++_static,\ diff --git a/docs/changelogs/Changelog-r21.md b/docs/changelogs/Changelog-r21.md index 388de1cb6..211c16e1a 100644 --- a/docs/changelogs/Changelog-r21.md +++ b/docs/changelogs/Changelog-r21.md @@ -69,9 +69,15 @@ For Android Studio issues, follow the docs on the [Android Studio site]. version 3.6 or newer to get the fix. * Fixed ndk-build to use Clang's default C++ standard version (currently C++14) when using libc++. + * Removed the `cxx-stl/system` module from ndk-build. The system STL is still + available (for now, see [Issue 744]); only an implementation detail has been + removed. If you were explicitly linking libstdc++ or importing + `cxx-stl/system`, remove that and ensure that `APP_STL` is set to `system` + instead. [Issue 1004]: https://github.com/android-ndk/ndk/issues/1004 [Issue 1028]: https://github.com/android/ndk/issues/1028 +[Issue 744]: https://github.com/android/ndk/issues/744 [Issue 855]: https://github.com/android-ndk/ndk/issues/855 [Issue 859]: https://github.com/android-ndk/ndk/issues/859 [Issue 884]: https://github.com/android-ndk/ndk/issues/884 diff --git a/sources/cxx-stl/system/Android.mk b/sources/cxx-stl/system/Android.mk deleted file mode 100644 index 8c0116519..000000000 --- a/sources/cxx-stl/system/Android.mk +++ /dev/null @@ -1,9 +0,0 @@ -LOCAL_PATH:= $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := libstdc++ -LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include -LOCAL_EXPORT_LDLIBS := -lstdc++ - -include $(BUILD_STATIC_LIBRARY) diff --git a/sources/cxx-stl/system/setup.mk b/sources/cxx-stl/system/setup.mk deleted file mode 100644 index 96b3d97e0..000000000 --- a/sources/cxx-stl/system/setup.mk +++ /dev/null @@ -1,4 +0,0 @@ -NDK_APP_CXX_STATIC_LIBRARIES := libstdc++ -NDK_APP_CXX_SHARED_LIBRARIES := - -include $(call my-dir)/Android.mk |