Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix lldb-server not copied to target device #179

Merged
merged 2 commits into from
Jul 11, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions xbuild/src/devices/adb.rs
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ impl Adb {
Ok(Path::new(std::str::from_utf8(&output.stdout)?.trim()).to_path_buf())
}*/

pub fn lldb(&self, device: &str, lldb_server: &Path, executable: &Path) -> Result<()> {
pub fn lldb(&self, device: &str, executable: &Path, lldb_server: &Path) -> Result<()> {
/*let package = env.manifest().android().package.as_ref().unwrap();
let app_dir = self.app_dir(device, package)?;
self.shell(device, Some(package))
Expand All @@ -302,12 +302,17 @@ impl Adb {
.arg("700")
.arg(&dest)
.status()?;*/
let lldb_device_path = Path::new("./lldb-server");
let mut lldb_server = self
.shell(device, None)
.arg("cd")
.arg("/data/local/tmp")
.arg("&&")
.arg("./lldb-server")
.arg("chmod")
.arg("777")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not reuse a+x from above?

.arg(lldb_device_path)
.arg("&&")
.arg(lldb_device_path)
.arg("platform")
.arg("--listen")
.arg("*:10086")
Expand Down
Loading