introduce $PACKAGE_NAME in vm_config
Bug: 372171883
Test: check config
Change-Id: If43cb264c907149ea86a0a4bf17be5d3636c0ac9
diff --git a/build/debian/vm_config.json.aarch64 b/build/debian/vm_config.json.aarch64
index 5b7489e..f31c5b7 100644
--- a/build/debian/vm_config.json.aarch64
+++ b/build/debian/vm_config.json.aarch64
@@ -12,7 +12,7 @@
"sharedPath": "/storage/emulated"
},
{
- "sharedPath": "/data/data/com.google.android.virtualization.terminal/files"
+ "sharedPath": "/data/data/$PACKAGE_NAME/files"
}
],
"protected": false,
diff --git a/build/debian/vm_config.json.x86_64 b/build/debian/vm_config.json.x86_64
index 8a491e4..12f99c3 100644
--- a/build/debian/vm_config.json.x86_64
+++ b/build/debian/vm_config.json.x86_64
@@ -12,7 +12,7 @@
"sharedPath": "/storage/emulated"
},
{
- "sharedPath": "/data/data/com.google.android.virtualization.terminal/files"
+ "sharedPath": "/data/data/$PACKAGE_NAME/files"
}
],
"kernel": "$PAYLOAD_DIR/vmlinuz",
diff --git a/libs/vm_launcher_lib/java/com/android/virtualization/vmlauncher/InstallUtils.java b/libs/vm_launcher_lib/java/com/android/virtualization/vmlauncher/InstallUtils.java
index a4e7809..1febe27 100644
--- a/libs/vm_launcher_lib/java/com/android/virtualization/vmlauncher/InstallUtils.java
+++ b/libs/vm_launcher_lib/java/com/android/virtualization/vmlauncher/InstallUtils.java
@@ -130,6 +130,7 @@
private static Function<String, String> getReplacer(Context context) {
Map<String, String> rules = new HashMap<>();
rules.put("\\$PAYLOAD_DIR", new File(context.getFilesDir(), PAYLOAD_DIR).toString());
+ rules.put("\\$PACKAGE_NAME", context.getPackageName());
return (s) -> {
for (Map.Entry<String, String> rule : rules.entrySet()) {
s = s.replaceAll(rule.getKey(), rule.getValue());