From 391cdde1dac037890cd0fad050abdb51f2d21aab Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Wed, 14 Sep 2016 15:52:39 -0700 Subject: [PATCH] Remove extra LOCAL_CXX_STL := none This was always being set in cc.Module.AndroidMk(), so we don't need to declare it again. This was causing problems for cc_binary modules that were using the NDK, since LOCAL_NDK_STL_VARIANT must be used instead. Test: Manually put ifneq ($(LOCAL_CXX_STL),none); $(error) checks Change-Id: If937b7b5ad30936e08c99f62ccf83b78d196dbfe --- cc/androidmk.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/cc/androidmk.go b/cc/androidmk.go index 831c0fbce..285a5a709 100644 --- a/cc/androidmk.go +++ b/cc/androidmk.go @@ -129,7 +129,6 @@ func (binary *binaryDecorator) AndroidMk(ctx AndroidMkContext, ret *android.Andr ret.Class = "EXECUTABLES" ret.Extra = append(ret.Extra, func(w io.Writer, outputFile android.Path) error { - fmt.Fprintln(w, "LOCAL_CXX_STL := none") fmt.Fprintln(w, "LOCAL_SYSTEM_SHARED_LIBRARIES :=") if Bool(binary.Properties.Static_executable) { fmt.Fprintln(w, "LOCAL_FORCE_STATIC_EXECUTABLE := true") @@ -157,7 +156,6 @@ func (library *toolchainLibraryDecorator) AndroidMk(ctx AndroidMkContext, ret *a ret.Class = "STATIC_LIBRARIES" ret.Extra = append(ret.Extra, func(w io.Writer, outputFile android.Path) error { fmt.Fprintln(w, "LOCAL_MODULE_SUFFIX := "+outputFile.Ext()) - fmt.Fprintln(w, "LOCAL_CXX_STL := none") fmt.Fprintln(w, "LOCAL_SYSTEM_SHARED_LIBRARIES :=") return nil