Snap for 11124398 from 266c10dae8521a0c1e9d73b013cd34ab95074643 to 24Q1-releaseandroid-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-release

Change-Id: I895a8b36dc518d8348dde181fb88fa875d1e5a47

5 files changed, 20 insertions, 0 deletions

diff --git a/1.0/Android.bp b/1.0/Android.bp
index 297b277..720e735 100644
--- a/1.0/Android.bp
+++ b/1.0/Android.bp
@@ -28,4 +28,8 @@ cc_binary {
         "liblog",
         "libutils",
     ],
+
+    arch: {
+        arm: { cflags: ["-DST_LIB_32"] },
+    }
 }
diff --git a/1.0/SecureElement.cpp b/1.0/SecureElement.cpp
index 7a71738..1501b9d 100644
--- a/1.0/SecureElement.cpp
+++ b/1.0/SecureElement.cpp
@@ -66,7 +66,11 @@ Return<void> SecureElement::init(
   }
 
   // Ignore this dlopen if you don't have libstpreprocess.so
+#if defined(ST_LIB_32)
+  void* stdll = dlopen("/vendor/lib/libstpreprocess.so", RTLD_NOW);
+#else
   void* stdll = dlopen("/vendor/lib64/libstpreprocess.so", RTLD_NOW);
+#endif
   if (stdll) {
     STAram_init fn_init = (STAram_init)dlsym(stdll, "STAram_init");
     if (fn_init) {
diff --git a/1.0/StEseService.cpp b/1.0/StEseService.cpp
index d6628e1..799d3eb 100644
--- a/1.0/StEseService.cpp
+++ b/1.0/StEseService.cpp
@@ -38,7 +38,11 @@ int main() {
   ALOGD("Secure Element HAL Service 1.0 is starting.");
 
   // Ignore this dlopen it doesn't needed.
+#if defined(ST_LIB_32)
+  void* stdll = dlopen("/vendor/lib/libstpreprocess.so", RTLD_NOW);
+#else
   void* stdll = dlopen("/vendor/lib64/libstpreprocess.so", RTLD_NOW);
+#endif
   if (stdll) {
     STEsePreProcess fn = (STEsePreProcess)dlsym(stdll, "pre_process");
     if (fn) {
diff --git a/1.2/Android.bp b/1.2/Android.bp
index 8a9b7f8..154b2a3 100644
--- a/1.2/Android.bp
+++ b/1.2/Android.bp
@@ -44,4 +44,8 @@ cc_binary {
         "liblog",
         "libutils",
     ],
+
+    arch: {
+        arm: { cflags: ["-DST_LIB_32"] },
+    }
 }
diff --git a/1.2/SecureElement.cpp b/1.2/SecureElement.cpp
index 222f41e..d817f43 100644
--- a/1.2/SecureElement.cpp
+++ b/1.2/SecureElement.cpp
@@ -24,7 +24,11 @@
 #include <stdlib.h>
 #include <string.h>
 
+#if defined(ST_LIB_32)
+#define VENDOR_LIB_PATH "/vendor/lib/"
+#else
 #define VENDOR_LIB_PATH "/vendor/lib64/"
+#endif
 #define VENDOR_LIB_EXT ".so"
 typedef int (*STEseReset)(void);