aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRayan Hallal <hrayan@google.com>2023-09-26 16:45:58 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-09-26 16:45:58 +0000
commitc7e7539e99a65b1be3b01fce6e073daee6262147 (patch)
tree7094c79dbdec624f69f4cc8b3f80b6e62926ce0e
parent3530c7950ac87b1f7aca82ba6637e3b139513196 (diff)
parent608cea67d402473dc77a344f5eaee77f5ccef5a8 (diff)
downloadvsomeip-c7e7539e99a65b1be3b01fce6e073daee6262147.tar.gz
Change default path for VSOMEIP_BASE_PATH am: 095bebf287 am: aa0d3b11be am: ec71062d30 am: 608cea67d4
Original change: https://android-review.googlesource.com/c/platform/external/sdv/vsomeip/+/2763268 Change-Id: I29a93c303f2065304556a84df48f8e32d59c4f59 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp5
-rw-r--r--implementation/configuration/include/internal_android.hpp2
2 files changed, 4 insertions, 3 deletions
diff --git a/Android.bp b/Android.bp
index 2a7f4470..2eaefba3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -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"