[make] re-derive STANDARD_ARCH_NAME in case ARCH is overridden
Bug: 136265573
Change-Id: Ia9e956ae4b1267b2d8ea10513222ffc2aebd9cde
diff --git a/make/xbin.mk b/make/xbin.mk
index ffef801..4209e31 100644
--- a/make/xbin.mk
+++ b/make/xbin.mk
@@ -66,6 +66,7 @@
# save global variables
SAVED_ARCH := $(ARCH)
+SAVED_STANDARD_ARCH_NAME := $(STANDARD_ARCH_NAME)
SAVED_GLOBAL_OPTFLAGS := $(GLOBAL_OPTFLAGS)
SAVED_GLOBAL_COMPILEFLAGS := $(GLOBAL_COMPILEFLAGS)
SAVED_GLOBAL_CFLAGS := $(GLOBAL_CFLAGS)
@@ -86,6 +87,9 @@
ALLMODULE_OBJS :=
ALLOBJS :=
+# Re-derive the standard arch name.
+$(eval $(call standard_name_for_arch,STANDARD_ARCH_NAME,$(ARCH),$(SUBARCH)))
+
# Override tools
include arch/$(ARCH)/toolchain.mk
@@ -199,6 +203,7 @@
GLOBAL_DEFINES := $(SAVED_GLOBAL_DEFINES)
ARCH := $(SAVED_ARCH)
+STANDARD_ARCH_NAME := $(SAVED_STANDARD_ARCH_NAME)
BUILDDIR := $(SAVED_BUILDDIR)
ALLMODULES := $(SAVED_ALLMODULES)
ALLMODULE_OBJS := $(SAVED_ALLMODULE_OBJS)
