commit 16d1be57da3fe3c0f840d4bbc9c9d8895def563c
author pdk <jizhou.liao@nxp.com> Thu Jul 12 10:32:35 2018 -0700
committer Ruchi Kandoi <kandoiruchi@google.com> Wed Jul 18 15:39:12 2018 +0000
tree bacf7b8da2cd5891a376a707453b8a5f268ab638
parent 969d041af6c465b95bb6ce70fbb7399c38f7b6a9

Add system property to specify LS script location and name

Bug: 109664165
Test: VTS, perform LoaderService script
Change-Id: I5760221e2376f3e50a9baf51daed44569d170c4c
(cherry picked from commit de23d4181d09298b3d3a2882a51c07d22fd210f2)

Android.bp

diff --git a/Android.bp b/Android.bp
index d1a00fb..e76951c 100755
--- a/Android.bp
+++ b/Android.bp
@@ -71,6 +71,7 @@
     shared_libs: [
         "ese_spi_nxp",
         "android.hardware.secure_element@1.0",
+        "libcutils",
         "liblog",
         "libhidlbase",
         "liblog",

ls_client/src/LsClient.cpp

diff --git a/ls_client/src/LsClient.cpp b/ls_client/src/LsClient.cpp
index 25b7c00..57bbf97 100755
--- a/ls_client/src/LsClient.cpp
+++ b/ls_client/src/LsClient.cpp
@@ -17,11 +17,13 @@
  ******************************************************************************/
 #define LOG_TAG "LSClient"
 #include "LsClient.h"
+#include <cutils/properties.h>
 #include <dirent.h>
 #include <log/log.h>
 #include <openssl/evp.h>
 #include <pthread.h>
 #include <stdlib.h>
+#include <string>
 #include "LsLib.h"
 
 uint8_t datahex(char c);
@@ -41,6 +43,28 @@
 
 static android::sp<ISecureElementHalCallback> cCallback;
 void* performLSDownload_thread(void* data);
+static void getLSScriptSourcePrefix(std::string& prefix);
+
+void getLSScriptSourcePrefix(std::string& prefix) {
+  char source_path[PROPERTY_VALUE_MAX] = {0};
+  int len = property_get("vendor.ese.loader_script_path", source_path, "");
+  if (len > 0) {
+    FILE* fd = fopen(source_path, "rb");
+    if (fd != NULL) {
+      char c;
+      while (!feof(fd) && fread(&c, 1, 1, fd) == 1) {
+        if (c == ' ' || c == '\n' || c == '\r' || c == 0x00) break;
+        prefix.push_back(c);
+      }
+    } else {
+      ALOGD("%s Cannot open file %s\n", __func__, source_path);
+    }
+  }
+  if (prefix.empty()) {
+    prefix.assign(ls_script_source_prefix);
+  }
+}
+
 /*******************************************************************************
 **
 ** Function:        LSC_Start
@@ -116,13 +140,16 @@
   uint8_t resSW[4] = {0x4e, 0x02, 0x69, 0x87};
 
   std::string sourcePath;
+  std::string sourcePrefix;
   std::string outPath;
   int index = 1;
   LSCSTATUS status = LSCSTATUS_SUCCESS;
   Lsc_HashInfo_t lsHashInfo;
+
+  getLSScriptSourcePrefix(sourcePrefix);
   do {
     /*Open the script file from specified location and name*/
-    sourcePath.assign(ls_script_source_prefix);
+    sourcePath.assign(sourcePrefix);
     sourcePath += ('0' + index);
     sourcePath += ls_script_source_suffix;
     FILE* fIn = fopen(sourcePath.c_str(), "rb");