diff options
author | Dan Albert <danalbert@google.com> | 2019-09-17 12:32:07 -0700 |
---|---|---|
committer | Dan Albert <danalbert@google.com> | 2019-09-17 14:10:11 -0700 |
commit | aab51cae0a8c772e28fd8e6f7ace342924840996 (patch) | |
tree | b81ed23cf69e3875316e809cba5fa4c3245f68f1 /build | |
parent | e8f2ded41cfcc281ec26d28d553d24d4631e65f7 (diff) | |
download | ndk-aab51cae0a8c772e28fd8e6f7ace342924840996.tar.gz |
Remove useless cxx-stl/system module.
This used to be used to export the system's basic C++ headers to
projects, but that's now handled directly by the toolchain.
Anyone that was explicitly linking this module will get the usual
"you're linking something that doesn't exist, are you sure you meant
to?" message.
Anyone explicitly importing this directory will receive a less clear
error message of "could not find cxx-stl/system".
Both of these error cases are extremely unlikely since this has never
been something user's have needed to do.
Test: ./checkbuild.py && ./run_test.py
Bug: https://github.com/android/ndk/issues/1081
Change-Id: I5350c05237f1851733d9a45eb1b5fd8445626fdb
Diffstat (limited to 'build')
-rw-r--r-- | build/core/definitions.mk | 6 |
1 files changed, 4 insertions, 2 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,\ |