diff --git a/src/Xamarin.Android.Tools.AndroidSdk/AndroidSdkInfo.cs b/src/Xamarin.Android.Tools.AndroidSdk/AndroidSdkInfo.cs index 5738fb1f..24064f99 100644 --- a/src/Xamarin.Android.Tools.AndroidSdk/AndroidSdkInfo.cs +++ b/src/Xamarin.Android.Tools.AndroidSdk/AndroidSdkInfo.cs @@ -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; } } diff --git a/src/Xamarin.Android.Tools.AndroidSdk/Sdks/AndroidSdkBase.cs b/src/Xamarin.Android.Tools.AndroidSdk/Sdks/AndroidSdkBase.cs index 1ea9121a..31d1b893 100644 --- a/src/Xamarin.Android.Tools.AndroidSdk/Sdks/AndroidSdkBase.cs +++ b/src/Xamarin.Android.Tools.AndroidSdk/Sdks/AndroidSdkBase.cs @@ -38,11 +38,13 @@ public AndroidSdkBase (Action 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"; @@ -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); @@ -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);