Merge "Make changes to support test_suites for test lib" (f190db2a) · Commits · e / os / android_build

core/base_rules.mk

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -713,6 +713,10 @@ ifeq ($(LOCAL_MODULE_CLASS),NATIVE_TESTS)
	endif		endif
	ifdef LOCAL_MULTILIB		ifdef LOCAL_MULTILIB
	multi_arch := true		multi_arch := true
			else ifeq ($(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK))
			ifeq ($(LOCAL_MODULE_CLASS),SHARED_LIBRARIES)
			multi_arch := true
			endif
	endif		endif

	ifdef multi_arch		ifdef multi_arch