Refactor: Generalize Code by Moving Vendor and Android-Specific Elements #154

quic-vkatoch · 2025-03-18T11:22:05Z

Refactored the codebase by moving vendor-specific and Android-specific elements into dedicated files, making the project more generic.

src/fastrpc_apps_user.c

src/adspmsgd.c

src/fastrpc_apps_user.c

ekanshibu · 2025-04-25T05:10:54Z

Please check if you can break the change into multiple commits instead of a single commit.

src/fastrpc_log.c

github-actions · 2025-07-15T02:15:16Z

This pull request has been marked as stale due to 60 days of inactivity. To prevent automatic closure in 10 days, remove the stale label or add a comment. You can reopen a closed pull request at any time.

ekanshibu · 2025-08-07T17:46:09Z

@quic-vkatoch, can you please rebase this PR?

quic-vkatoch · 2025-08-12T11:27:43Z

@quic-vkatoch, can you please rebase this PR?

Done

src/fastrpc_log.c

inc/AEEStdErr.h

lumag · 2025-10-14T10:05:11Z

inc/apps_std_internal.h

 #endif
 #endif /* ENABLE_UPSTREAM_DRIVER_INTERFACE */

-#ifndef VENDOR_DSP_LOCATION


How are these two changes related to each other?

These changes are unrelated; I will update the PR.

lumag · 2025-10-14T10:05:43Z

inc/fastrpc_trace.h

 #ifndef FASTRPC_TRACE_H
 #define FASTRPC_TRACE_H

-#if ((defined _ANDROID) || (defined ANDROID)) || (defined DISABLE_ATRACE) && !defined(LE_ENABLE)


Again, totally unrelated changes

These changes are unrelated; I will update the PR.

lumag · 2025-10-14T10:06:34Z

src/pl_list.c


 PL_DEP(gpls)
-PL_DEP(listener_android)
+PL_DEP(listener)


Sould this be a part of the previous commit?

You're right, I'll do that.

lumag · 2025-10-14T10:06:43Z

src/Makefile.am

 		dspqueue/dspqueue_cpu.c \
 		dspqueue/dspqueue_rpc_stub.c \
-		listener_android.c \
+		listener.c \


Sould this be a part of the previous commit?

You're right, I'll do that.

lumag · 2025-10-14T10:07:10Z

src/fastrpc_apps_user.c

 #include "fastrpc_pm.h"
 #include "fastrpc_procbuf.h"
-#include "listener_android.h"
+#include "listener.h"


Ugh. Make sure that each commit works on its own. The code was broken up to now.

Sure, I'll do that.

lumag · 2025-10-14T10:07:40Z

src/fastrpc_apps_user.c

      pthread_mutex_destroy(&hlist[i].async_init_deinit_mut);
    }
-    listener_android_deinit();
+    listener_deinit();


I will update the PR.

lumag · 2025-10-14T10:08:41Z

src/fastrpc_log.c

                       const char *format, ...) {
  int len = 0;
  va_list argp;
-  char *buf = NULL, *log = NULL;


Again, feels like several unrelated changed squashed toggether.

When I removed debug_build_type (ro.debuggable) under fastrpc_log_init, it caused issues due to incorrectness in the HAP_debug_runtime function, so I had to update it. I'll remove this change from the current PR and submit a separate PR to address the fix.

quic-vkatoch · 2025-10-22T17:59:54Z

This PR depends on PR #252 being merged first.

Chennak-quic · 2025-09-02T10:06:13Z

inc/apps_std_internal.h

If we are removing the support for /vendor/dsp, where is shell expected to be pushed for android targets ? if it is /usr/lib/dsp/ like other LE targets, is /usr partition available on android targets ?

how is this change tested on android targets ?

I have to check where the shell should be placed if /vendor/dsp support is removed, or if we actually need to remove it in the first place.

Regarding testing: earlier, the daemons were already running (opened the shell) and the tests passed. After killing and updating with new daemons, the tests are now failing. I will check this further and update.

The shell is loaded from the same folder as all other DSP libraries. What's the question?

If we are removing the support for /vendor/dsp, where is shell expected to be pushed for android targets ? if it is /usr/lib/dsp/ like other LE targets, is /usr partition available on android targets ?

All DSP binaries are located in the subdirs of /usr/share/qcom, one subdir per device.

On Android systems you can reuse the same approach, changing /usr/share/qcom/ to /vendor or its subdir. All config files should be relative to that path,

Create fastrpc_android.h/c for Android-specific DSP search paths and update fastrpc_config_parser.h for Linux paths, removing vendor directories from both. Remove VENDOR_DSP_LOCATION and VENDOR_DOM_LOCATION macros from apps_std_internal.h. Simplify open_shell() in fastrpc_apps_user.c by removing vendor path fallback logic. Update Makefiles to conditionally compile fastrpc_android.c for Android builds. This separates platform-specific configurations and eliminates redundant vendor path fallbacks. Signed-off-by: Vinayak Katoch <vkatoch@qti.qualcomm.com>

Change header guard macros from FASTRPC_ANDROID_USER_H to FASTRPC_USER_H to remove Android-specific naming and make the header more generic for cross-platform usage. Signed-off-by: Vinayak Katoch <vkatoch@qti.qualcomm.com>

Rename listener_android.h to listener.h and listener_android.c to listener.c to remove Android-specific naming. Update all function names from listener_android_* to listener_* pattern. Update header guards, includes, Makefile entries, platform library dependencies, and all function calls throughout the codebase to maintain compilation compatibility. Signed-off-by: Vinayak Katoch <vkatoch@qti.qualcomm.com>

Remove unused convert_level_to_android_priority() function, TODO comments referencing Android-specific code, and Android include statements. Update AEE_EINVHANDLE comment to remove vendor-specific reference and clean up conditional compilation blocks for Android platforms. Signed-off-by: Vinayak Katoch <vkatoch@qti.qualcomm.com>

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 <vkatoch@qti.qualcomm.com>

ekanshibu reviewed Apr 7, 2025

View reviewed changes

src/fastrpc_apps_user.c Show resolved Hide resolved

src/adspmsgd.c Outdated Show resolved Hide resolved

lumag reviewed Apr 22, 2025

View reviewed changes

src/fastrpc_apps_user.c Outdated Show resolved Hide resolved

quic-vkatoch force-pushed the code-cleanup branch from 5ad182f to e92d2c8 Compare April 24, 2025 04:00

lumag reviewed Apr 24, 2025

View reviewed changes

src/fastrpc_apps_user.c Outdated Show resolved Hide resolved

quic-vkatoch force-pushed the code-cleanup branch from e92d2c8 to 66cba44 Compare April 25, 2025 08:33

lumag reviewed Apr 25, 2025

View reviewed changes

src/fastrpc_log.c Outdated Show resolved Hide resolved

github-actions bot added the Stale label Jul 15, 2025

quic-vkatoch force-pushed the code-cleanup branch 3 times, most recently from 0ffa6c4 to f7d23d7 Compare August 12, 2025 10:48

ekanshibu removed the Stale label Aug 12, 2025

quic-vkatoch force-pushed the code-cleanup branch from f7d23d7 to 4e34aac Compare August 12, 2025 11:21

ekanshibu reviewed Aug 24, 2025

View reviewed changes

src/fastrpc_log.c Show resolved Hide resolved

ekanshibu requested changes Aug 24, 2025

View reviewed changes

inc/AEEStdErr.h Show resolved Hide resolved

quic-vkatoch force-pushed the code-cleanup branch from 4e34aac to 44fd420 Compare August 25, 2025 06:26

quic-vkatoch requested a review from ekanshibu August 25, 2025 06:30

ekanshibu previously approved these changes Sep 1, 2025

View reviewed changes

ekanshibu enabled auto-merge September 1, 2025 04:27

auto-merge was automatically disabled October 13, 2025 16:56
Head branch was pushed to by a user without write access

quic-vkatoch dismissed ekanshibu’s stale review via ef69f29 October 13, 2025 16:56

quic-vkatoch force-pushed the code-cleanup branch 2 times, most recently from ef69f29 to 040ef4c Compare October 13, 2025 17:14

quic-vkatoch requested review from ekanshibu and lumag October 14, 2025 06:12

lumag suggested changes Oct 14, 2025

View reviewed changes

quic-vkatoch force-pushed the code-cleanup branch from 040ef4c to e26a068 Compare October 22, 2025 17:48

quic-vkatoch requested a review from lumag October 23, 2025 05:32

Chennak-quic reviewed Oct 23, 2025

View reviewed changes

quic-parihar mentioned this pull request Dec 17, 2025

Update DSP mount and search path configuration #234

Merged

quic-vkatoch marked this pull request as draft December 21, 2025 15:16

quic-vkatoch added 4 commits December 28, 2025 12:27

Remove Android reference from fastrpc_apps_user.h header guards

4d0e431

Change header guard macros from FASTRPC_ANDROID_USER_H to FASTRPC_USER_H to remove Android-specific naming and make the header more generic for cross-platform usage. Signed-off-by: Vinayak Katoch <vkatoch@qti.qualcomm.com>

quic-vkatoch force-pushed the code-cleanup branch from e26a068 to eb9d72f Compare December 28, 2025 09:27

quic-vkatoch force-pushed the code-cleanup branch from eb9d72f to 056c191 Compare December 28, 2025 09:46

quic-vkatoch requested a review from Chennak-quic December 28, 2025 09:49

quic-vkatoch changed the title ~~Refactor: Generalize Code by Removing Vendor and Android-Specific Elements~~ Refactor: Generalize Code by Moving Vendor and Android-Specific Elements Dec 29, 2025

quic-vkatoch marked this pull request as ready for review December 31, 2025 06:34

Refactor: Generalize Code by Moving Vendor and Android-Specific Elements #154

Are you sure you want to change the base?

Refactor: Generalize Code by Moving Vendor and Android-Specific Elements #154

Uh oh!

Conversation

quic-vkatoch commented Mar 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ekanshibu commented Apr 25, 2025

Uh oh!

Uh oh!

github-actions bot commented Jul 15, 2025

Uh oh!

ekanshibu commented Aug 7, 2025

Uh oh!

quic-vkatoch commented Aug 12, 2025

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

quic-vkatoch commented Oct 22, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

quic-vkatoch commented Mar 18, 2025 •

edited

Loading