From 3e63052e2b4db07179fea4f99b9f782729af7c97 Mon Sep 17 00:00:00 2001 From: dimitry Date: Tue, 2 Apr 2019 10:50:11 +0200 Subject: [PATCH] Enable native_bridge Bug: http://b/77159578 Test: make Change-Id: Ia078073ff27e10156d552a7a94b961c020d4e38d --- core/soong_config.mk | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/core/soong_config.mk b/core/soong_config.mk index 19326dd6fd..48db6b1021 100644 --- a/core/soong_config.mk +++ b/core/soong_config.mk @@ -58,6 +58,16 @@ $(call add_json_str, DeviceSecondaryArchVariant, $(TARGET_2ND_ARCH_VARIA $(call add_json_str, DeviceSecondaryCpuVariant, $(TARGET_2ND_CPU_VARIANT)) $(call add_json_list, DeviceSecondaryAbi, $(TARGET_2ND_CPU_ABI) $(TARGET_2ND_CPU_ABI2)) +$(call add_json_str, NativeBridgeArch, $(TARGET_NATIVE_BRIDGE_ARCH)) +$(call add_json_str, NativeBridgeArchVariant, $(TARGET_NATIVE_BRIDGE_ARCH_VARIANT)) +$(call add_json_str, NativeBridgeCpuVariant, $(TARGET_NATIVE_BRIDGE_CPU_VARIANT)) +$(call add_json_list, NativeBridgeAbi, $(TARGET_NATIVE_BRIDGE_ABI)) + +$(call add_json_str, NativeBridgeSecondaryArch, $(TARGET_NATIVE_BRIDGE_2ND_ARCH)) +$(call add_json_str, NativeBridgeSecondaryArchVariant, $(TARGET_NATIVE_BRIDGE_2ND_ARCH_VARIANT)) +$(call add_json_str, NativeBridgeSecondaryCpuVariant, $(TARGET_NATIVE_BRIDGE_2ND_CPU_VARIANT)) +$(call add_json_list, NativeBridgeSecondaryAbi, $(TARGET_NATIVE_BRIDGE_2ND_ABI)) + $(call add_json_str, HostArch, $(HOST_ARCH)) $(call add_json_str, HostSecondaryArch, $(HOST_2ND_ARCH)) $(call add_json_bool, HostStaticBinaries, $(BUILD_HOST_static))