Skip to content

Add path to apkanalyzer tool #49

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.

Sign up for GitHub

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

Closed
olegoid wants to merge 5 commits into from
Closed

Add path to apkanalyzer tool #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d854df3
Return tools path as opposed to returning tool name
olegoid Sep 19, 2018
ca0d7b6
Add AndroidToolsBinPath and ApkAnalyzer
olegoid Sep 19, 2018
f072b54
Surface ApkAnalyzerPath in AndroidSdkInfo
olegoid Sep 19, 2018
c518af4
Revert "Return tools path as opposed to returning tool name"
olegoid Sep 19, 2018
5176caf
Combine toolname with the actual path
olegoid Sep 19, 2018
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
4 changes: 4 additions & 0 deletions src/Xamarin.Android.Tools.AndroidSdk/AndroidSdkInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,10 @@ public bool IsPlatformInstalled (int apiLevel)
return apiLevel != 0 && Directory.Exists (GetPlatformDirectory (apiLevel));
}

public string ApkAnalyzerPath {
get { return Path.Combine (sdk.AndroidToolsBinPath, sdk.ApkAnalyzer); }
}

public string AndroidNdkPath {
get { return sdk.AndroidNdkPath; }
}
Expand Down
4 changes: 4 additions & 0 deletions src/Xamarin.Android.Tools.AndroidSdk/Sdks/AndroidSdkBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,13 @@ public AndroidSdkBase (Action<TraceLevel, string> logger)
public string JavaSdkPath { get; private set; }
public string JavaBinPath { get; private set; }
public string AndroidToolsPath { get; private set; }
public string AndroidToolsBinPath { get; private set; }
public string AndroidPlatformToolsPath { get; private set; }
public string AndroidToolsPathShort { get; private set; }
public string AndroidPlatformToolsPathShort { get; private set; }

public virtual string Adb { get; protected set; } = "adb";
public virtual string ApkAnalyzer { get; protected set; } = "apkanalyzer";
public virtual string Android { get; protected set; } = "android";
public virtual string Emulator { get; protected set; } = "emulator";
public virtual string Monitor { get; protected set; } = "monitor";
Expand Down Expand Up @@ -77,6 +79,7 @@ public virtual void Initialize (string androidSdkPath = null, string androidNdkP

if (!string.IsNullOrEmpty (AndroidSdkPath)) {
AndroidToolsPath = Path.Combine (AndroidSdkPath, "tools");
AndroidToolsBinPath = Path.Combine (AndroidToolsPath, "bin");
AndroidToolsPathShort = GetShortFormPath (AndroidToolsPath);
AndroidPlatformToolsPath = Path.Combine (AndroidSdkPath, "platform-tools");
AndroidPlatformToolsPathShort = GetShortFormPath (AndroidPlatformToolsPath);
Expand All @@ -96,6 +99,7 @@ public virtual void Initialize (string androidSdkPath = null, string androidNdkP
// we need to look for extensions other than the default .exe|.bat
// google have a habbit of changing them.
Adb = GetExecutablePath (AndroidPlatformToolsPath, Adb);
ApkAnalyzer = GetExecutablePath (AndroidToolsBinPath, ApkAnalyzer);
Android = GetExecutablePath (AndroidToolsPath, Android);
Emulator = GetExecutablePath (AndroidToolsPath, Emulator);
Monitor = GetExecutablePath (AndroidToolsPath, Monitor);
Expand Down