Revert "Fix logfile path if not absolute"
This reverts commit 3bf1b81380155db7791ddfe97e77a1c1f6d90e43.
Reason for revert: Appears to break all LUCI ART builds
Change-Id: I3cb4cb23e24df82e9cf6ec64637ee264bde01d8b
diff --git a/adbconnection/adbconnection.cc b/adbconnection/adbconnection.cc
index 4759bed..3ca9166 100644
--- a/adbconnection/adbconnection.cc
+++ b/adbconnection/adbconnection.cc
@@ -859,36 +859,6 @@
return res;
}
-#if defined(__ANDROID__)
-void FixLogfile(JdwpArgs& parameters) {
- const std::string kLogfile = "logfile";
- // On Android, an app will not have write access to the cwd (which is "/").
- // If a relative path was provided, we need to patch it with a writable
- // location. For now, we use /data/data/<PKG_NAME>.
- // Note that /data/local/tmp/ was also considered but it not a good candidate since apps don't
- // have write access to it.
-
- if (!parameters.contains(kLogfile)) {
- return;
- }
-
- std::string& logfile = parameters.get(kLogfile);
- if (logfile.front() == '/') {
- // We only fix logfile if it is not using an absolute path
- return;
- }
-
- std::string packageName = art::Runtime::Current()->GetProcessPackageName();
- if (packageName.empty()) {
- VLOG(jdwp) << "Unable to fix relative path logfile='" + logfile + "' without package name.";
- return;
- }
- parameters.put(kLogfile, "/data/data/" + packageName + "/" + logfile);
-}
-#else
-void FixLogfile(JdwpArgs&) {}
-#endif
-
std::string AdbConnectionState::MakeAgentArg() {
const std::string& opts = art::Runtime::Current()->GetJdwpOptions();
DCHECK(ValidateJdwpOptions(opts));
@@ -913,9 +883,6 @@
parameters.put("transport", "dt_fd_forward");
parameters.put("address", std::to_string(remote_agent_control_sock_));
- // If logfile is relative, we need to fix it.
- FixLogfile(parameters);
-
// TODO Get agent_name_ from something user settable?
return agent_name_ + "=" + parameters.join();
}
diff --git a/adbconnection/jdwpargs.h b/adbconnection/jdwpargs.h
index c1c69e2..f3ade44 100644
--- a/adbconnection/jdwpargs.h
+++ b/adbconnection/jdwpargs.h
@@ -37,10 +37,6 @@
// Add a key / value
void put(const std::string& key, const std::string& value);
- bool contains(const std::string& key) { return store.find(key) != store.end(); }
-
- std::string& get(const std::string& key) { return store[key]; }
-
// Concatenate all key/value into a command separated list of "key=value" entries.
std::string join();