File tree Expand file tree Collapse file tree 5 files changed +9
-3
lines changed
Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Android Expand file tree Collapse file tree 5 files changed +9
-3
lines changed Original file line number Diff line number Diff line change 1- xamarin/monodroid:main@91b4ef9fcfad5906b0699865afb3e46c383a5710
1+ xamarin/monodroid:main@297767fcc65fc43487949d51dee753d454c647f1
22mono/mono:2020-02@148f536b0b463a111a021b960ee3aeaed0cf203b
Original file line number Diff line number Diff line change 7878 <AndroidToolchainDirectory Condition =" '$(AndroidToolchainDirectory)' == '' " >$(HOME)\android-toolchain</AndroidToolchainDirectory >
7979 <AndroidMxeInstallPrefix Condition =" '$(HostOS)' == 'Linux' " >\usr</AndroidMxeInstallPrefix >
8080 <AndroidMxeInstallPrefix Condition =" '$(HostOS)' == 'Darwin' " >$(HostHomebrewPrefix)</AndroidMxeInstallPrefix >
81+ <AndroidSdkDirectory Condition =" '$(AndroidSdkDirectory)' == '' And Exists($(ANDROID_SDK_ROOT)) " >$(ANDROID_SDK_ROOT)</AndroidSdkDirectory >
8182 <AndroidSdkDirectory Condition =" '$(AndroidSdkDirectory)' == '' " >$(AndroidToolchainDirectory)\sdk</AndroidSdkDirectory >
83+ <AndroidNdkDirectory Condition =" '$(AndroidNdkDirectory)' == '' And Exists($(ANDROID_NDK_LATEST_HOME)) " >$(ANDROID_NDK_LATEST_HOME)</AndroidNdkDirectory >
8284 <AndroidNdkDirectory Condition =" '$(AndroidNdkDirectory)' == '' " >$(AndroidToolchainDirectory)\ndk</AndroidNdkDirectory >
8385 <DotNetPreviewPath Condition =" '$(DotNetPreviewPath)' == '' " >$(AndroidToolchainDirectory)\dotnet\</DotNetPreviewPath >
8486 <DotNetPreviewTool Condition =" '$(DotNetPreviewTool)' == '' " >$(DotNetPreviewPath)dotnet</DotNetPreviewTool >
Original file line number Diff line number Diff line change 3333 <PropertyGroup >
3434 <_Target >-source $(JavacSourceVersion) -target $(JavacTargetVersion)</_Target >
3535 <_D >-d "$(IntermediateOutputPath)jcw/bin"</_D >
36- <_AndroidJar >"$(AndroidToolchainDirectory)\sdk \platforms\android-$(AndroidPlatformId)\android.jar"</_AndroidJar >
36+ <_AndroidJar >"$(AndroidSdkDirectory) \platforms\android-$(AndroidPlatformId)\android.jar"</_AndroidJar >
3737 <_MonoAndroidJar >$(OutputPath)mono.android.jar</_MonoAndroidJar >
3838 <_MonoAndroidRuntimeJar >$(OutputPath)..\..\..\xbuild\Xamarin\Android\java_runtime.jar</_MonoAndroidRuntimeJar >
3939 </PropertyGroup >
Original file line number Diff line number Diff line change @@ -28,6 +28,8 @@ public static string GetAndroidSdkPath ()
2828 sdkPath = Environment . GetEnvironmentVariable ( "ANDROID_SDK_PATH" ) ;
2929 if ( String . IsNullOrEmpty ( sdkPath ) )
3030 sdkPath = GetPathFromRegistry ( "AndroidSdkDirectory" ) ;
31+ if ( String . IsNullOrEmpty ( sdkPath ) )
32+ sdkPath = Environment . GetEnvironmentVariable ( "ANDROID_SDK_ROOT" ) ;
3133 if ( String . IsNullOrEmpty ( sdkPath ) )
3234 sdkPath = Path . GetFullPath ( Path . Combine ( ToolchainPath , "sdk" ) ) ;
3335
@@ -42,6 +44,8 @@ public static string GetAndroidNdkPath ()
4244 ndkPath = Environment . GetEnvironmentVariable ( "ANDROID_NDK_PATH" ) ;
4345 if ( String . IsNullOrEmpty ( ndkPath ) )
4446 ndkPath = GetPathFromRegistry ( "AndroidNdkDirectory" ) ;
47+ if ( String . IsNullOrEmpty ( ndkPath ) )
48+ ndkPath = Environment . GetEnvironmentVariable ( "ANDROID_NDK_LATEST_HOME" ) ;
4549 if ( String . IsNullOrEmpty ( ndkPath ) )
4650 ndkPath = Path . GetFullPath ( Path . Combine ( ToolchainPath , "ndk" ) ) ;
4751
Original file line number Diff line number Diff line change 5151 />
5252 <PropertyGroup >
5353 <_Target Condition =" '$(JavacSourceVersion)' != ''" >-source $(JavacSourceVersion) -target $(JavacTargetVersion)</_Target >
54- <_AndroidJar >"$(AndroidToolchainDirectory)\sdk \platforms\android-$(AndroidJavaRuntimeApiLevel)\android.jar"</_AndroidJar >
54+ <_AndroidJar >"$(AndroidSdkDirectory) \platforms\android-$(AndroidJavaRuntimeApiLevel)\android.jar"</_AndroidJar >
5555 </PropertyGroup >
5656 <Exec
5757 Command =" " $(JavaCPath)" $(_Target) -d %(_RuntimeOutput.IntermediateRuntimeOutputPath) -bootclasspath $(_AndroidJar)$(PathSeparator)" %(_RuntimeOutput.OutputJar)" @%(_RuntimeOutput.IntermediateRuntimeClassesTxt)"
You can’t perform that action at this time.
0 commit comments