From 6326d1b8d42161cba1c3509f9c87c947850790c4 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 6 Sep 2016 10:24:28 -0700 Subject: [PATCH] Support HOST_PREFER_32_BIT HOST_PREFER_32_BIT has been removed from the build system, support it directly in art. When it is set, set the compile_multilib property of all host art modules to "prefer32". Change-Id: I794df17a805588392bd448983f279e4b8c8fe1c6 --- build/art.go | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/build/art.go b/build/art.go index f305c0784..ffe870b6e 100644 --- a/build/art.go +++ b/build/art.go @@ -137,6 +137,20 @@ func (a *artGlobalDefaults) CustomizeProperties(ctx android.CustomizePropertiesC p.Target.Android.Cflags = deviceFlags(ctx) p.Target.Host.Cflags = hostFlags(ctx) ctx.AppendProperties(p) + + if envTrue(ctx, "HOST_PREFER_32_BIT") { + type props struct { + Target struct { + Host struct { + Compile_multilib string + } + } + } + + p := &props{} + p.Target.Host.Compile_multilib = "prefer32" + ctx.AppendProperties(p) + } } type artGlobalDefaults struct{} -- 2.11.0