jacinto6: sgx: Extend SGX support for platforms other than DRA7

We need next pre-built libraries

    gralloc.jacinto6.so
    memtrack.jacinto6.so

to have names w.r.t. platform we are building AFS for. For instance, for
AM57x EVM we want those libraries to be named like this:

    gralloc.am57x.so
    memtrack.am57x.so

Android UI won't bring up without this change.

Change-Id: Ic6ff167ad311fef558e1c8b4e83a55dfe9f4c634
Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org>

1 files changed, 5 insertions, 4 deletions

diff --git a/jacinto6/sgx/Android.mk b/jacinto6/sgx/Android.mk
index 862dffb..9d007ad 100644
--- a/jacinto6/sgx/Android.mk
+++ b/jacinto6/sgx/Android.mk
@@ -28,9 +28,10 @@ LOCAL_PATH := $$(img-sgx.untarred_bin)
 include $$(BUILD_SYSTEM)/base_rules.mk
 $$(LOCAL_BUILT_MODULE) : PRIVATE_SRC := $$(img-sgx.untarred_bin)/$1
 $$(LOCAL_BUILT_MODULE) : $$(img-sgx.untarred_timestamp) | $$(ACP)
-        @echo "Copy $$@ <- $$(PRIVATE_SRC)"
+        $(eval FIXED_SRC := $$(img-sgx.untarred_bin)/$(subst $(TARGET_BOARD_PLATFORM),jacinto6,$1))
+        @echo "Copy $$@ <- $(FIXED_SRC)"
         @mkdir -p $(dir $$@)
-        $$(hide) $$(ACP) -fp $$(PRIVATE_SRC) $$@
+        $$(hide) $$(ACP) -fp $(FIXED_SRC) $$@
 endef
 
 define _add-sgx-vendor-bin
@@ -99,8 +100,8 @@ prebuilt_sgx_vendor_libs := \
         lib/libusc.so \
         lib/libPVRScopeServices.so \
         lib/libsrv_um.so \
-        lib/hw/gralloc.jacinto6.so \
-        lib/hw/memtrack.jacinto6.so \
+        lib/hw/gralloc.$(TARGET_BOARD_PLATFORM).so \
+        lib/hw/memtrack.$(TARGET_BOARD_PLATFORM).so \
         lib/libpvrANDROID_WSEGL.so \
         lib/libpvr2d.so \
         lib/libsrv_init.so \