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

Commit fb2449f7 authored by dimitry's avatar dimitry
Browse files

Add NativeBridgeRelativePath config variables 

This will allow us to unhardcode relative paths for native-bridge
binaries in soong.

Test: make PRODUCT-cf_x86_phone-userdebug
Change-Id: I72b33ee610c92d41e1370fcaa1512529c5d7c88c
parent 576ae962

core/main.mk

+8 −0
Original line number Diff line number Diff line
@@ -1275,6 +1275,14 @@ APEX_LIBS_ABSENCE_CHECK_EXCLUDE := lib/bootstrap lib64/bootstrap 
# when native bridge is active.

APEX_LIBS_ABSENCE_CHECK_EXCLUDE += lib/arm lib64/arm64



ifdef TARGET_NATIVE_BRIDGE_RELATIVE_PATH

	APEX_LIBS_ABSENCE_CHECK_EXCLUDE += lib/$(TARGET_NATIVE_BRIDGE_RELATIVE_PATH) lib64/$(TARGET_NATIVE_BRIDGE_RELATIVE_PATH)

endif



ifdef TARGET_NATIVE_BRIDGE_2ND_RELATIVE_PATH

	APEX_LIBS_ABSENCE_CHECK_EXCLUDE += lib/$(TARGET_NATIVE_BRIDGE_2ND_RELATIVE_PATH) lib64/$(TARGET_NATIVE_BRIDGE_2ND_RELATIVE_PATH)

endif



# Exclude vndk-* subdirectories which contain prebuilts from older releases.

APEX_LIBS_ABSENCE_CHECK_EXCLUDE += lib/vndk-% lib64/vndk-%

core/soong_config.mk

+2 −0
Original line number Diff line number Diff line
@@ -62,11 +62,13 @@ $(call add_json_str, NativeBridgeArch, $(TARGET_NATIVE_BRIDGE_ 
$(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,  NativeBridgeRelativePath,          $(TARGET_NATIVE_BRIDGE_RELATIVE_PATH))



$(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,  NativeBridgeSecondaryRelativePath, $(TARGET_NATIVE_BRIDGE_2ND_RELATIVE_PATH))



$(call add_json_str,  HostArch,                          $(HOST_ARCH))

$(call add_json_str,  HostSecondaryArch,                 $(HOST_2ND_ARCH))