Move Android property system to fastrpc_android.c/.h

quic-vkatoch · quic-vkatoch · commit 056c191c22ed · 2025-12-28T15:16:08.000+05:30
Move Android property arrays (ANDROIDP_DEBUG_VAR_NAME and
ANDROID_DEBUG_VAR_NAME) to fastrpc_android.c. Add functions
android_get_property_int(), android_get_property_string(), and
android_is_debug_build() to handle Android-specific property
operations and build type checking.

Update fastrpc_apps_user.c to call Android functions when on
Android platform while maintaining environment variable fallback.
Update fastrpc_log.c to use android_is_debug_build() for debug
buffer allocation.

Android functionality preserved and isolated in dedicated files.

Signed-off-by: Vinayak Katoch &lt;vkatoch@qti.qualcomm.com&gt;
diff --git a/inc/fastrpc_android.h b/inc/fastrpc_android.h
@@ -4,6 +4,19 @@
 #ifndef FASTRPC_ANDROID_H
 #define FASTRPC_ANDROID_H
 
+#include "fastrpc_common.h"
+
 #define DEFAULT_DSP_SEARCH_PATHS ";/vendor/lib/rfsa/adsp;/vendor/dsp/;"
 
+/* Android property system functions */
+int property_get_int32(const char *name, int value);
+int property_get(const char *name, int *def, int *value);
+
+/* Android-specific property getter functions */
+int android_get_property_int(fastrpc_properties UserPropKey, int defValue);
+int android_get_property_string(fastrpc_properties UserPropKey, char *value, char *defValue);
+
+/* Android build type checking function */
+int android_is_debug_build(void);
+
 #endif /*FASTRPC_ANDROID_H*/
diff --git a/src/fastrpc_android.c b/src/fastrpc_android.c
@@ -1,4 +1,127 @@
 // Copyright (c) 2024, Qualcomm Innovation Center, Inc. All rights reserved.
 // SPDX-License-Identifier: BSD-3-Clause
 
-#include "fastrpc_android.h"
+#include "fastrpc_android.h"
+#include "HAP_farf.h"
+#include <string.h>
+
+#define PROPERTY_VALUE_MAX 92
+
+/* Android P (vendor) property names */
+const char *ANDROIDP_DEBUG_VAR_NAME[] = {"vendor.fastrpc.process.attrs",
+                                         "vendor.fastrpc.debug.trace",
+                                         "vendor.fastrpc.debug.testsig",
+                                         "vendor.fastrpc.perf.kernel",
+                                         "vendor.fastrpc.perf.adsp",
+                                         "vendor.fastrpc.perf.freq",
+                                         "vendor.fastrpc.debug.systrace",
+                                         "vendor.fastrpc.debug.pddump",
+                                         "persist.vendor.fastrpc.process.attrs",
+                                         "ro.build.type"};
+
+/* Android (system) property names */
+const char *ANDROID_DEBUG_VAR_NAME[] = {"fastrpc.process.attrs",
+                                        "fastrpc.debug.trace",
+                                        "fastrpc.debug.testsig",
+                                        "fastrpc.perf.kernel",
+                                        "fastrpc.perf.adsp",
+                                        "fastrpc.perf.freq",
+                                        "fastrpc.debug.systrace",
+                                        "fastrpc.debug.pddump",
+                                        "persist.fastrpc.process.attrs",
+                                        "ro.build.type"};
+
+int NO_ANDROIDP_DEBUG_VAR_NAME_ARRAY_ELEMENTS =
+    sizeof(ANDROIDP_DEBUG_VAR_NAME) / sizeof(char *);
+int NO_ANDROID_DEBUG_VAR_NAME_ARRAY_ELEMENTS =
+    sizeof(ANDROID_DEBUG_VAR_NAME) / sizeof(char *);
+
+/* Stub implementations for property functions - to be implemented with actual Android property API */
+int property_get_int32(const char *name, int value) {
+    return 0;
+}
+
+int property_get(const char *name, int *def, int *value) {
+    return 0;
+}
+
+int android_get_property_int(fastrpc_properties UserPropKey, int defValue) {
+#if !defined(LE_ENABLE) // Android platform
+#if !defined(SYSTEM_RPC_LIBRARY) // vendor library
+  if (((int)UserPropKey > NO_ANDROIDP_DEBUG_VAR_NAME_ARRAY_ELEMENTS)) {
+    FARF(
+        ERROR,
+        "%s: Index %d out-of-bound for ANDROIDP_DEBUG_VAR_NAME array of len %d",
+        __func__, UserPropKey, NO_ANDROIDP_DEBUG_VAR_NAME_ARRAY_ELEMENTS);
+    return defValue;
+  }
+  return (int)property_get_int32(ANDROIDP_DEBUG_VAR_NAME[UserPropKey],
+                                 defValue);
+#else // system library
+  if (((int)UserPropKey > NO_ANDROID_DEBUG_VAR_NAME_ARRAY_ELEMENTS)) {
+    FARF(ERROR,
+         "%s: Index %d out-of-bound for ANDROID_DEBUG_VAR_NAME array of len %d",
+         __func__, UserPropKey, NO_ANDROID_DEBUG_VAR_NAME_ARRAY_ELEMENTS);
+    return defValue;
+  }
+  return (int)property_get_int32(ANDROID_DEBUG_VAR_NAME[UserPropKey], defValue);
+#endif
+#else // non-Android platforms
+  return defValue;
+#endif
+}
+
+int android_get_property_string(fastrpc_properties UserPropKey, char *value,
+                                char *defValue) {
+  int len = 0;
+#if !defined(LE_ENABLE) // Android platform
+#if !defined(SYSTEM_RPC_LIBRARY) // vendor library
+  if (((int)UserPropKey > NO_ANDROIDP_DEBUG_VAR_NAME_ARRAY_ELEMENTS)) {
+    FARF(
+        ERROR,
+        "%s: Index %d out-of-bound for ANDROIDP_DEBUG_VAR_NAME array of len %d",
+        __func__, UserPropKey, NO_ANDROIDP_DEBUG_VAR_NAME_ARRAY_ELEMENTS);
+    return len;
+  }
+  return property_get(ANDROIDP_DEBUG_VAR_NAME[UserPropKey], (int *)value,
+                      (int *)defValue);
+#else // system library
+  if (((int)UserPropKey > NO_ANDROID_DEBUG_VAR_NAME_ARRAY_ELEMENTS)) {
+    FARF(ERROR,
+         "%s: Index %d out-of-bound for ANDROID_DEBUG_VAR_NAME array of len %d",
+         __func__, UserPropKey, NO_ANDROID_DEBUG_VAR_NAME_ARRAY_ELEMENTS);
+    return len;
+  }
+  return property_get(ANDROID_DEBUG_VAR_NAME[UserPropKey], value, defValue);
+#endif
+#else // non-Android platforms
+  if (defValue != NULL) {
+    strncpy(value, defValue, PROPERTY_VALUE_MAX - 1);
+    value[PROPERTY_VALUE_MAX - 1] = '\0';
+    return strlen(defValue);
+  }
+  return len;
+#endif
+}
+
+/* Check if Android build is debug/eng/userdebug type */
+int android_is_debug_build(void) {
+  int debug_build_type = 0;
+  char build_type[PROPERTY_VALUE_MAX];
+
+  /*
+   * Get build type by reading the target properties,
+   * if build type is eng or userdebug return 1.
+   */
+  if (android_get_property_string(FASTRPC_BUILD_TYPE, build_type, NULL)) {
+#if !defined(LE_ENABLE)
+    if (!strncmp(build_type, "eng", PROPERTY_VALUE_MAX) ||
+        !strncmp(build_type, "userdebug", PROPERTY_VALUE_MAX))
+      debug_build_type = 1;
+#else
+    if (atoi(build_type))
+      debug_build_type = 1;
+#endif
+  }
+  return debug_build_type;
+}
diff --git a/src/fastrpc_apps_user.c b/src/fastrpc_apps_user.c
@@ -225,28 +225,7 @@ const char *ENV_DEBUG_VAR_NAME[] = {"FASTRPC_PROCESS_ATTRS",
                                     "FASTRPC_PERF_FREQ",
                                     "FASTRPC_DEBUG_SYSTRACE",
                                     "FASTRPC_DEBUG_PDDUMP",
-                                    "FASTRPC_PROCESS_ATTRS_PERSISTENT",
-                                    "ro.debuggable"};
-const char *ANDROIDP_DEBUG_VAR_NAME[] = {"vendor.fastrpc.process.attrs",
-                                         "vendor.fastrpc.debug.trace",
-                                         "vendor.fastrpc.debug.testsig",
-                                         "vendor.fastrpc.perf.kernel",
-                                         "vendor.fastrpc.perf.adsp",
-                                         "vendor.fastrpc.perf.freq",
-                                         "vendor.fastrpc.debug.systrace",
-                                         "vendor.fastrpc.debug.pddump",
-                                         "persist.vendor.fastrpc.process.attrs",
-                                         "ro.build.type"};
-const char *ANDROID_DEBUG_VAR_NAME[] = {"fastrpc.process.attrs",
-                                        "fastrpc.debug.trace",
-                                        "fastrpc.debug.testsig",
-                                        "fastrpc.perf.kernel",
-                                        "fastrpc.perf.adsp",
-                                        "fastrpc.perf.freq",
-                                        "fastrpc.debug.systrace",
-                                        "fastrpc.debug.pddump",
-                                        "persist.fastrpc.process.attrs",
-                                        "ro.build.type"};
+                                    "FASTRPC_PROCESS_ATTRS_PERSISTENT"};
 
 const char *SUBSYSTEM_NAME[] = {"adsp", "mdsp", "sdsp", "cdsp", "cdsp1", "gdsp0", "gdsp1", "reserved"};
 
@@ -260,10 +239,6 @@ static const size_t invoke_end_trace_strlen = sizeof(INVOKE_END_TRACE_STR) - 1;
 
 int NO_ENV_DEBUG_VAR_NAME_ARRAY_ELEMENTS =
     sizeof(ENV_DEBUG_VAR_NAME) / sizeof(char *);
-int NO_ANDROIDP_DEBUG_VAR_NAME_ARRAY_ELEMENTS =
-    sizeof(ANDROIDP_DEBUG_VAR_NAME) / sizeof(char *);
-int NO_ANDROID_DEBUG_VAR_NAME_ARRAY_ELEMENTS =
-    sizeof(ANDROID_DEBUG_VAR_NAME) / sizeof(char *);
 
 /* Shell prefix for signed and unsigned */
 const char *const SIGNED_SHELL = "fastrpc_shell_";
@@ -471,10 +446,6 @@ static uint32_t crc32_lut(unsigned char *data, int nbyte, uint32_t *crctab) {
   return crc;
 }
 
-int property_get_int32(const char *name, int value) { return 0; }
-
-int property_get(const char *name, int *def, int *value) { return 0; }
-
 int fastrpc_get_property_int(fastrpc_properties UserPropKey, int defValue) {
   if (((int)UserPropKey > NO_ENV_DEBUG_VAR_NAME_ARRAY_ELEMENTS)) {
     FARF(ERROR,
@@ -486,25 +457,7 @@ int fastrpc_get_property_int(fastrpc_properties UserPropKey, int defValue) {
   if (env != 0)
     return (int)atoi(env);
 #if !defined(LE_ENABLE) // Android platform
-#if !defined(SYSTEM_RPC_LIBRARY) // vendor library
-  if (((int)UserPropKey > NO_ANDROIDP_DEBUG_VAR_NAME_ARRAY_ELEMENTS)) {
-    FARF(
-        ERROR,
-        "%s: Index %d out-of-bound for ANDROIDP_DEBUG_VAR_NAME array of len %d",
-        __func__, UserPropKey, NO_ANDROIDP_DEBUG_VAR_NAME_ARRAY_ELEMENTS);
-    return defValue;
-  }
-  return (int)property_get_int32(ANDROIDP_DEBUG_VAR_NAME[UserPropKey],
-                                 defValue);
-#else // system library
-  if (((int)UserPropKey > NO_ANDROID_DEBUG_VAR_NAME_ARRAY_ELEMENTS)) {
-    FARF(ERROR,
-         "%s: Index %d out-of-bound for ANDROID_DEBUG_VAR_NAME array of len %d",
-         __func__, UserPropKey, NO_ANDROID_DEBUG_VAR_NAME_ARRAY_ELEMENTS);
-    return defValue;
-  }
-  return (int)property_get_int32(ANDROID_DEBUG_VAR_NAME[UserPropKey], defValue);
-#endif
+  return android_get_property_int(UserPropKey, defValue);
 #else // non-Android platforms
   return defValue;
 #endif
@@ -525,25 +478,7 @@ int fastrpc_get_property_string(fastrpc_properties UserPropKey, char *value,
     return strlen(env);
   }
 #if !defined(LE_ENABLE) // Android platform
-#if !defined(SYSTEM_RPC_LIBRARY) // vendor library
-  if (((int)UserPropKey > NO_ANDROIDP_DEBUG_VAR_NAME_ARRAY_ELEMENTS)) {
-    FARF(
-        ERROR,
-        "%s: Index %d out-of-bound for ANDROIDP_DEBUG_VAR_NAME array of len %d",
-        __func__, UserPropKey, NO_ANDROIDP_DEBUG_VAR_NAME_ARRAY_ELEMENTS);
-    return len;
-  }
-  return property_get(ANDROIDP_DEBUG_VAR_NAME[UserPropKey], (int *)value,
-                      (int *)defValue);
-#else // system library
-  if (((int)UserPropKey > NO_ANDROID_DEBUG_VAR_NAME_ARRAY_ELEMENTS)) {
-    FARF(ERROR,
-         "%s: Index %d out-of-bound for ANDROID_DEBUG_VAR_NAME array of len %d",
-         __func__, UserPropKey, NO_ANDROID_DEBUG_VAR_NAME_ARRAY_ELEMENTS);
-    return len;
-  }
-  return property_get(ANDROID_DEBUG_VAR_NAME[UserPropKey], value, defValue);
-#endif
+  return android_get_property_string(UserPropKey, value, defValue);
 #else // non-Android platforms
   if (defValue != NULL) {
     strncpy(value, defValue, PROPERTY_VALUE_MAX - 1);
diff --git a/src/fastrpc_log.c b/src/fastrpc_log.c
@@ -19,6 +19,10 @@
 #include "rpcmem_internal.h"
 #include "verify.h"
 
+#if defined(ANDROID) || defined(_ANDROID)
+#include "fastrpc_android.h"
+#endif
+
 #define PROPERTY_VALUE_MAX 72
 /* Create persist buffer of size 1 MB */
 #define DEBUG_BUF_SIZE 1024 * 1024
@@ -288,18 +292,12 @@ void fastrpc_log_init() {
   pthread_mutex_lock(&persist_buf.mut);
   /*
    * Get build type by reading the target properties,
-   * if buuid type is eng or userdebug allocate 1 MB persist buf.
+   * if build type is eng or userdebug allocate 1 MB persist buf.
    */
-  if (fastrpc_get_property_string(FASTRPC_BUILD_TYPE, build_type, NULL)) {
-#if !defined(LE_ENABLE)
-    if (!strncmp(build_type, "eng", PROPERTY_VALUE_MAX) ||
-        !strncmp(build_type, "userdebug", PROPERTY_VALUE_MAX))
-      debug_build_type = true;
-#else
-    if (atoi(build_type))
-      debug_build_type = true;
+#if !defined(LE_ENABLE) // Android platform
+  debug_build_type = android_is_debug_build();
 #endif
-  }
+
   if (persist_buf.buf == NULL && debug_build_type) {
     /* Create a debug buffer to append DEBUG FARF level message. */
     persist_buf.buf = (char *)rpcmem_alloc_internal(
