Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b808ea58 authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Remove support for device libstdc++ as stl" 

am: 5b5929aa

* commit '5b5929aa':
  Remove support for device libstdc++ as stl
parents 313bba65 5b5929aa

core/cxx_stl_setup.mk

+1 −4
Original line number Original line Diff line number Diff line
@@ -105,11 +105,8 @@ ifneq ($(filter $(my_cxx_stl),libc++ libc++_static),) 
else ifeq ($(my_cxx_stl),ndk)

else ifeq ($(my_cxx_stl),ndk)

    # Using an NDK STL. Handled in binary.mk.

    # Using an NDK STL. Handled in binary.mk.

else ifeq ($(my_cxx_stl),libstdc++)

else ifeq ($(my_cxx_stl),libstdc++)

    # Using bionic's basic libstdc++. Not actually an STL. Only around until the

    # tree is in good enough shape to not need it.

    ifndef LOCAL_IS_HOST_MODULE

    ifndef LOCAL_IS_HOST_MODULE

        my_c_includes += bionic/libstdc++/include

        $(error $(LOCAL_PATH): $(LOCAL_MODULE): libstdc++ is not supported for device modules)

        my_system_shared_libraries += libstdc++

    else

    else

        # Host builds will use the system C++. libc++ on Darwin, GNU libstdc++ everywhere else

        # Host builds will use the system C++. libc++ on Darwin, GNU libstdc++ everywhere else

        my_cppflags += $($(my_prefix)SYSTEMCPP_CPPFLAGS)

        my_cppflags += $($(my_prefix)SYSTEMCPP_CPPFLAGS)