am 8bb12127: Merge "Don\'t use an STL for libm."
				
					
				
			* commit '8bb12127e62c1fc4d9dc99ce9272008023c7c08e': Don't use an STL for libm.
This commit is contained in:
		@@ -295,6 +295,7 @@ LOCAL_SRC_FILES_mips := mips/fenv.c
 | 
				
			|||||||
LOCAL_C_INCLUDES_mips64 := $(libm_ld_includes)
 | 
					LOCAL_C_INCLUDES_mips64 := $(libm_ld_includes)
 | 
				
			||||||
LOCAL_SRC_FILES_mips64 := mips/fenv.c $(libm_ld_src_files)
 | 
					LOCAL_SRC_FILES_mips64 := mips/fenv.c $(libm_ld_src_files)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					LOCAL_CXX_STL := none
 | 
				
			||||||
include $(BUILD_STATIC_LIBRARY)
 | 
					include $(BUILD_STATIC_LIBRARY)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
@@ -312,6 +313,8 @@ LOCAL_WHOLE_STATIC_LIBRARIES := libm
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
LOCAL_NATIVE_COVERAGE := $(bionic_coverage)
 | 
					LOCAL_NATIVE_COVERAGE := $(bionic_coverage)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					LOCAL_CXX_STL := none
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# We'd really like to do this for all architectures, but since this wasn't done
 | 
					# We'd really like to do this for all architectures, but since this wasn't done
 | 
				
			||||||
# before, these symbols must continue to be exported on LP32 for binary
 | 
					# before, these symbols must continue to be exported on LP32 for binary
 | 
				
			||||||
# compatibility.
 | 
					# compatibility.
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user