android-tools: Fix library linking issue for img2simg and simg2img

Fix "libsparse.so.0:cannot open shared object file:No such file or directory"
error found at runtime on usage of img2simg and simg2img.

Modify patches to resolve the issue by updating LDFLAGS to use a relative
rpath instead of a fixed path to ensure runtime linking works correcly.
Explicitly link additional libraries to resolve dependencies.

Signed-off-by: Bhabu Bindu <bindu.bhabu@kpit.com>

2 files changed, 16 insertions, 8 deletions

diff --git a/dynamic-layers/selinux/android-tools/android-tools/core/0009-patching-img2simg.mk-to-build-in-yocto-environment.patch b/dynamic-layers/selinux/android-tools/android-tools/core/0009-patching-img2simg.mk-to-build-in-yocto-environment.patch
index ad9b8dd..8ecfdbc 100644
--- a/dynamic-layers/selinux/android-tools/android-tools/core/0009-patching-img2simg.mk-to-build-in-yocto-environment.patch
+++ b/dynamic-layers/selinux/android-tools/android-tools/core/0009-patching-img2simg.mk-to-build-in-yocto-environment.patch
@@ -16,7 +16,12 @@ are searched in the output folder.
 
 Modified the build rule so that it outputs the binary to the OUT_DIR
 
+Update LDFLAGS to use a relative rpath instead of a fixed location
+to ensure libraries are found at runtime relative to binary location.
+Link additional libraries which might help with dependency resolution.
+
 Signed-off-by: Nisha Parrakat <Nisha.Parrakat@kpit.com>
+Signed-off-by: Bindu.Bhabu <bindu.bhabu@kpit.com>
 
 Upstream-Status: Pending
 ---
@@ -34,11 +39,10 @@ index f1036cef..94772381 100644
  SOURCES := $(foreach source, $(SOURCES), libsparse/$(source))
  CPPFLAGS += -Ilibsparse/include -Iinclude -std=gnu++17
 -LDFLAGS += -Wl,-rpath=/usr/lib/$(DEB_HOST_MULTIARCH)/android \
--           -Wl,-rpath-link=. \
++LDFLAGS += -Wl,-rpath='$$ORIGIN/../lib/android' \
+            -Wl,-rpath-link=. \
 -           -L. -lsparse
-+LDFLAGS += -Wl,-rpath=$(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android \
-+           -Wl,-rpath-link=$(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/ \
-+           -L$(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/ -lsparse
++           -L$(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/ -lbase -llog -lpthread -lsparse
  
  build: $(SOURCES)
 -       $(CXX) $^ -o libsparse/$(NAME) $(CPPFLAGS) $(LDFLAGS)
diff --git a/dynamic-layers/selinux/android-tools/android-tools/core/0010-patching-simg2img.mk-to-build-in-yocto-environment.patch b/dynamic-layers/selinux/android-tools/android-tools/core/0010-patching-simg2img.mk-to-build-in-yocto-environment.patch
index b7a72b8..f2f5598 100644
--- a/dynamic-layers/selinux/android-tools/android-tools/core/0010-patching-simg2img.mk-to-build-in-yocto-environment.patch
+++ b/dynamic-layers/selinux/android-tools/android-tools/core/0010-patching-simg2img.mk-to-build-in-yocto-environment.patch
@@ -16,7 +16,12 @@ are searched in the output folder.
 
 Modified the build rule so that it outputs the binary to the OUT_DIR
 
+Update LDFLAGS to use a relative rpath instead of a fixed location
+to ensure libraries are found at runtime relative to binary location.
+Link additional libraries which might help with dependency resolution.
+
 Signed-off-by: Nisha Parrakat <Nisha.Parrakat@kpit.com>
+Signed-off-by: Bhabu Bindu <bindu.bhabu@kpit.com>
 
 Upstream-Status: Pending
 ---
@@ -34,11 +39,10 @@ index 07fb56b4..d319c87e 100644
  SOURCES := $(foreach source, $(SOURCES), libsparse/$(source))
  CPPFLAGS += -Ilibsparse/include -Iinclude -std=gnu++17
 -LDFLAGS += -Wl,-rpath=/usr/lib/$(DEB_HOST_MULTIARCH)/android \
--           -Wl,-rpath-link=. \
++LDFLAGS += -Wl,-rpath='$$ORIGIN/../lib/android' \
+            -Wl,-rpath-link=. \
 -           -L. -lsparse
-+LDFLAGS += -Wl,-rpath=$(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android \
-+           -Wl,-rpath-link=$(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android \
-+           -L$(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android -lsparse
++           -L$(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/ -lbase -llog -lpthread -lsparse
  
  build: $(SOURCES)
 -       $(CXX) $^ -o libsparse/$(NAME) $(CPPFLAGS) $(LDFLAGS)