commit fb2449f7b700cef385edf85eb325ad4dbb5d2d35
author dimitry <dimitry@google.com> Wed Jul 10 11:08:58 2019 +0200
committer dimitry <dimitry@google.com> Fri Jul 12 16:08:00 2019 +0200
tree d060c67e2063bf39c71f42006b9f376894a296c0
parent 576ae9628b9aeeee8dfcd00042b01c3b467eefe3

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

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index 4552cf2..d13d793 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -1275,6 +1275,14 @@
 # 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-%