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

Commit c222a10d authored Aug 28, 2015 by Dan Willemsen Committed by Android Git Automerger Aug 28, 2015

am d1746299: am 57ff23b0: Merge "Add support for LOCAL_SRC_FILES_(host)_(arch)"

* commit 'd1746299':
  Add support for LOCAL_SRC_FILES_(host)_(arch)

parents 00cf9d50 d1746299

core/binary.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -154,7 +154,7 @@ endif
		endif

		ifdef LOCAL_IS_HOST_MODULE
		my_src_files += $(LOCAL_SRC_FILES_$($(my_prefix)OS))
		my_src_files += $(LOCAL_SRC_FILES_$($(my_prefix)OS)) $(LOCAL_SRC_FILES_$($(my_prefix)OS)_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH))
		my_static_libraries += $(LOCAL_STATIC_LIBRARIES_$($(my_prefix)OS))
		my_shared_libraries += $(LOCAL_SHARED_LIBRARIES_$($(my_prefix)OS))
		my_cflags += $(LOCAL_CFLAGS_$($(my_prefix)OS))

core/clear_vars.mk

+5 −0

Original line number	Diff line number	Diff line
		@@ -266,6 +266,11 @@ LOCAL_C_INCLUDES_$(HOST_OS):=
		LOCAL_GENERATED_SOURCES_$(HOST_OS):=
		LOCAL_REQUIRED_MODULES_$(HOST_OS):=

		LOCAL_SRC_FILES_$(HOST_OS)_$(HOST_ARCH):=
		ifdef HOST_2ND_ARCH
		LOCAL_SRC_FILES_$(HOST_OS)_$(HOST_2ND_ARCH):=
		endif

		LOCAL_SRC_FILES_32:=
		LOCAL_SRC_FILES_64:=
		LOCAL_SHARED_LIBRARIES_32:=