diff options
author | Rayan Hallal <hrayan@google.com> | 2023-09-26 15:10:12 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-09-26 15:10:12 +0000 |
commit | ec71062d30717544b768022c8f883913b477977c (patch) | |
tree | 7094c79dbdec624f69f4cc8b3f80b6e62926ce0e | |
parent | 303c38e3622bcdecca7afcd977226e22d8b012ec (diff) | |
parent | aa0d3b11be4cb4caccaa7c27092110b8460ea991 (diff) | |
download | vsomeip-ec71062d30717544b768022c8f883913b477977c.tar.gz |
Change default path for VSOMEIP_BASE_PATH am: 095bebf287 am: aa0d3b11be
Original change: https://android-review.googlesource.com/c/platform/external/sdv/vsomeip/+/2763268
Change-Id: Ia64604c2782322e40d2285e762c339a7bef4441e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | Android.bp | 5 | ||||
-rw-r--r-- | implementation/configuration/include/internal_android.hpp | 2 |
2 files changed, 4 insertions, 3 deletions
@@ -79,7 +79,7 @@ gensrcs { cmd: "sed" + " -e \"s|@DEFAULT_CONFIGURATION_FILE@|/etc/vsomeip.json|g\"" + " -e \"s|@DEFAULT_CONFIGURATION_FOLDER@|/etc/vsomeip|g\"" + - " -e \"s|@VSOMEIP_BASE_PATH@|/tmp|g\"" + + " -e \"s|@VSOMEIP_BASE_PATH@|/data|g\"" + " -e \"s|@VSOMEIP_MAJOR_VERSION@||g\"" + " -e \"s|@VSOMEIP_DIAGNOSIS_ADDRESS@|0x01|g\"" + " -e \"s|libvsomeip3-cfg\\.so\\.|libvsomeip3-cfg.so|g\"" + @@ -103,7 +103,8 @@ cc_library_shared { ], cflags: [ - "-DWITHOUT_SYSTEMD" + "-DWITHOUT_SYSTEMD", + "-DVSOMEIP_BASE_PATH=\"/data/\"" ], rtti: true, diff --git a/implementation/configuration/include/internal_android.hpp b/implementation/configuration/include/internal_android.hpp index 8ecd2b59..9124d9b3 100644 --- a/implementation/configuration/include/internal_android.hpp +++ b/implementation/configuration/include/internal_android.hpp @@ -27,7 +27,7 @@ #define VSOMEIP_DEBUG_CONFIGURATION_FOLDER "/var/opt/public/sin/vsomeip/" #define VSOMEIP_LOCAL_CONFIGURATION_FOLDER "./vsomeip" -#define VSOMEIP_BASE_PATH "/storage/" +// #define VSOMEIP_BASE_PATH "/storage/" #define VSOMEIP_CFG_LIBRARY "libvsomeip3-cfg.so" |