commit 25b2a651d5227ce4e87ffb860a336b7f6b554aa7
author Christopher Ferris <cferris@google.com> Wed Jul 13 22:58:40 2022 -0700
committer Christopher Ferris <cferris@google.com> Thu Jul 14 13:31:51 2022 -0700
tree a8fe5ac6fe20093ece20b03d05da670665edeb77
parent aba99adea4cbc0ff0036e5523caebd3ff867daf7

Add ability to force compile as 64 bit.

When trying to build a single 64 bit and 32 bit image, there are
a few executables that are prefer32. When set, this will force all
of those targets to be compiled as 64 bit.

Test: With this option, drmserver/mediaserver are built as 64 bit.
Test: Without this option, drmserver/mediaserver are built as 32 bit.
Change-Id: I84f6be7fe0fa3a9ea86ecc4dd785aaf1825f9925

core/soong_config.mk

diff --git a/core/soong_config.mk b/core/soong_config.mk
index feffcc7..c4a40af 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -293,6 +293,8 @@
 
 $(call add_json_bool, GenerateAidlNdkPlatformBackend, $(filter true,$(NEED_AIDL_NDK_PLATFORM_BACKEND)))
 
+$(call add_json_bool, IgnorePrefer32OnDevice, $(filter true,$(IGNORE_PREFER32_ON_DEVICE)))
+
 $(call json_end)
 
 $(file >$(SOONG_VARIABLES).tmp,$(json_contents))