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

inc/apps_std_internal.h

inc/fastrpc_trace.h

src/pl_list.c

src/Makefile.am

src/fastrpc_apps_user.c

src/fastrpc_log.c

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,

quic-vkatoch · 2026-01-14T06:31:55Z

@lumag, could you please review this PR?

src/fastrpc_android.c

inc/fastrpc_android.h

inc/fastrpc_apps_user.h

lumag · 2026-01-14T12:48:14Z

inc/fastrpc_android.h

+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);


Drop android_foo() functions from the public header. Define platform-neutral API, which can be implemented for Android, LE, or some other OS.

Ack, updated.

src/fastrpc_android.c

Remove VENDOR_DSP_LOCATION and VENDOR_DOM_LOCATION macros from apps_std_internal.h and fastrpc_apps_user.c. Simplify open_shell() by removing fallback logic that attempted to open shell files from /vendor/dsp/ and /vendor/dsp/xdsp/. Shell files are now opened only from DSP_LIBS_LOCATION paths. Update comments in apps_std_imp.c to reflect generic fallback behavior without vendor path references. Signed-off-by: Vinayak Katoch <vkatoch@qti.qualcomm.com>

Change header guard macros from FASTRPC_ANDROID_USER_H to FASTRPC_APPS_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>

Create fastrpc_android.h and fastrpc_android.c with Android-specific property handling. Move ANDROIDP_DEBUG_VAR_NAME array and implement platform_get_property_int() and platform_get_property_string(). Remove ANDROID_DEBUG_VAR_NAME array and SYSTEM_RPC_LIBRARY conditional compilation from fastrpc_apps_user.c. Simplify fastrpc_get_property_int() and fastrpc_get_property_string() to call platform functions. Update Makefiles to include fastrpc_android.h and conditionally compile fastrpc_android.c for Android builds. 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 force-pushed the code-cleanup branch 2 times, most recently 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

quic-vkatoch force-pushed the code-cleanup branch from 056c191 to 9d4d996 Compare January 13, 2026 17:32

quic-bkumar previously approved these changes Jan 14, 2026

View reviewed changes

ekanshibu requested changes Jan 14, 2026

View reviewed changes

src/fastrpc_android.c Outdated Show resolved Hide resolved

inc/fastrpc_android.h Outdated Show resolved Hide resolved

lumag suggested changes Jan 14, 2026

View reviewed changes

quic-vkatoch dismissed quic-bkumar’s stale review via 0dc0c36 January 18, 2026 16:27

quic-vkatoch force-pushed the code-cleanup branch from 9d4d996 to 0dc0c36 Compare January 18, 2026 16:27

quic-vkatoch requested review from ekanshibu and lumag January 18, 2026 16:34

quic-vkatoch added 5 commits January 19, 2026 16:42

quic-vkatoch force-pushed the code-cleanup branch from 0dc0c36 to e4aee33 Compare January 19, 2026 11:13

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!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

quic-vkatoch commented Oct 22, 2025

Uh oh!

Chennak-quic Sep 2, 2025

Choose a reason for hiding this comment

Uh oh!

quic-vkatoch Oct 23, 2025

Choose a reason for hiding this comment

Uh oh!

lumag Oct 23, 2025

Choose a reason for hiding this comment

Uh oh!

lumag Oct 24, 2025

Choose a reason for hiding this comment

Uh oh!

lumag Oct 24, 2025

Choose a reason for hiding this comment

Uh oh!

quic-vkatoch commented Jan 14, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

lumag Jan 14, 2026

Choose a reason for hiding this comment

Uh oh!

quic-vkatoch Jan 18, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

quic-vkatoch commented Mar 18, 2025 •

edited

Loading