Skip to content

[Xamarin.Android.Build.Tasks] Enabling <AndroidUseSharedRuntime> in some projects causes classes.dex to not deploy to device. #236

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

Merged
merged 1 commit into from
Sep 28, 2016
Merged

[Xamarin.Android.Build.Tasks] Enabling <AndroidUseSharedRuntime> in some projects causes classes.dex to not deploy to device. #236

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 22 additions & 11 deletions src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,7 @@ Copyright (C) 2011-2012 Xamarin. All rights reserved.
<Target Name="_BuildAdditionalResourcesCache"
Inputs="@(ReferencePath);@(ReferenceDependencyPaths)"
Outputs="$(_AndroidResourcePathsCache)"
DependsOnTargets="$(_BeforeBuildAdditionalResourcesCache)"
>
<GetAdditionalResourcesFromAssemblies
AndroidSdkDirectory="$(_AndroidSdkDirectory)"
Expand Down Expand Up @@ -503,7 +504,7 @@ Copyright (C) 2011-2012 Xamarin. All rights reserved.
</ItemGroup>
</Target>

<Target Name="_ValidateAndroidPackageProperties" DependsOnTargets="_ResolveMonoAndroidSdks">
<Target Name="_ValidateAndroidPackageProperties" DependsOnTargets="$(_OnResolveMonoAndroidSdks)">
<CreateProperty Value="$(ProjectDir)$(AndroidManifest)" Condition="'$(AndroidManifest)' != ''">
<Output TaskParameter="Value" PropertyName="_AndroidManifestAbs"/>
</CreateProperty>
Expand Down Expand Up @@ -537,7 +538,7 @@ Copyright (C) 2011-2012 Xamarin. All rights reserved.
</Target>

<Target Name="_AddAndroidDefines"
DependsOnTargets="_ResolveMonoAndroidSdks">
DependsOnTargets="$(_OnResolveMonoAndroidSdks)">
</Target>

<Target Name="_GetReferenceAssemblyPaths">
Expand Down Expand Up @@ -607,14 +608,22 @@ Copyright (C) 2011-2012 Xamarin. All rights reserved.
</CreateItem>
</Target>

<Target Name="_SetupApplicationJavaClass" AfterTargets="_ResolveMonoAndroidSdks">
<Target Name="_SetupApplicationJavaClass" AfterTargets="_ResolveMonoAndroidSdks" DependsOnTargets="$(_BeforeSetupApplicationJavaClass)">
<PropertyGroup>
<AndroidApplicationJavaClass Condition="'$(AndroidApplicationJavaClass)' == '' And $(AndroidEnableMultiDex)">android.support.multidex.MultiDexApplication</AndroidApplicationJavaClass>
<AndroidApplicationJavaClass Condition="'$(AndroidApplicationJavaClass)' == ''">android.app.Application</AndroidApplicationJavaClass>
</PropertyGroup>
<Message Text="Application Java class: $(AndroidApplicationJavaClass)" />
</Target>


<PropertyGroup>
<_OnResolveMonoAndroidSdks>
_ResolveMonoAndroidSdks
;$(_AfterResolveMonoAndroidSdks)
</_OnResolveMonoAndroidSdks>
</PropertyGroup>

<!--
Resolves tools paths and SDK paths, and verifies everything is installed.
If the framework directories haven't been resolved, it takes care of those too,
Expand Down Expand Up @@ -1013,7 +1022,7 @@ because xbuild doesn't support framework reference assemblies.
<Target Name="_GenerateAndroidResourceDir"
Inputs="$(MSBuildAllProjects);@(AndroidResource);$(_AndroidBuildPropertiesCache)"
Outputs="@(_AndroidResourceDest)"
DependsOnTargets="_ResolveMonoAndroidSdks">
DependsOnTargets="$(_OnResolveMonoAndroidSdks)">
<CopyAndConvertResources SourceFiles="@(AndroidResource)"
DestinationFiles="@(_AndroidResourceDest)"
AcwMapFile="$(_AcwMapFile)"
Expand Down Expand Up @@ -1212,7 +1221,7 @@ because xbuild doesn't support framework reference assemblies.
<_UpdateAndroidResgenDependsOnTargets>
_CheckForDeletedResourceFile;
_ValidateAndroidPackageProperties;
_ResolveMonoAndroidSdks;
$(_OnResolveMonoAndroidSdks);
_GetLibraryImports;
_CheckDuplicateJavaLibraries;
_GetAdditionalResourcesFromAssemblies;
Expand Down Expand Up @@ -1418,7 +1427,7 @@ because xbuild doesn't support framework reference assemblies.
<Target Name="_AddStaticResources"
Inputs="$(MonoPlatformJarPath);$(_AndroidBuildPropertiesCache)"
Outputs="$(_AndroidStaticResourcesFlag)"
DependsOnTargets="_GetMonoPlatformJarPath">
DependsOnTargets="$(_BeforeAddStaticResources);_GetMonoPlatformJarPath">
<CopyResource ResourceName="machine.config" OutputPath="$(MonoAndroidIntermediateAssetsDir)machine.config" />
<CopyResource
ResourceName="MonoRuntimeProvider.Bundled.java"
Expand Down Expand Up @@ -1656,7 +1665,7 @@ because xbuild doesn't support framework reference assemblies.
</Target>

<Target Name="_GenerateJavaStubs"
DependsOnTargets="_SetLatestTargetFrameworkVersion;_PrepareAssemblies"
DependsOnTargets="_SetLatestTargetFrameworkVersion;_PrepareAssemblies;$(_AfterPrepareAssemblies)"
Inputs="$(MSBuildAllProjects);@(_ResolvedAssemblies);$(_AndroidManifestAbs);$(_AndroidBuildPropertiesCache)"
Outputs="$(IntermediateOutputPath)android\AndroidManifest.xml;$(_AcwMapFile);$(_AndroidTypeMappingJavaToManaged);$(_AndroidTypeMappingManagedToJava)">
<GenerateJavaStubs
Expand Down Expand Up @@ -1827,14 +1836,15 @@ because xbuild doesn't support framework reference assemblies.
_FindJavaStubFiles;
_AddStaticResources;
_GetMonoPlatformJarPath;
_ResolveMonoAndroidSdks;
$(_OnResolveMonoAndroidSdks);
_GetLibraryImports;
_CheckDuplicateJavaLibraries;
_CreateBaseApk;
_GetAdditionalResourcesFromAssemblies;
_CreateAdditionalResourceCache;
_DetermineJavaLibrariesToCompile;
$(_CompileJavaDependsOnTargetsForJack);
$(_CompileJavaDependsOnTargets)
</_CompileJavaDependsOnTargets>
</PropertyGroup>

Expand Down Expand Up @@ -2134,6 +2144,7 @@ because xbuild doesn't support framework reference assemblies.
_LinkAssemblies;
_GetAddOnPlatformLibraries;
_CompileDex;
$(_AfterCompileDex);
_CompileJava;
_CreateBaseApk;
_PrepareAssemblies;
Expand Down Expand Up @@ -2248,7 +2259,7 @@ because xbuild doesn't support framework reference assemblies.
</_CopyPackageInputs>
</PropertyGroup>

<Target Name="_DefineBuildTargetAbis">
<Target Name="_DefineBuildTargetAbis" DependsOnTargets="$(_BeforeDefineBuildTargetAbis)">
<CreateProperty Value="$(AndroidSupportedAbis)" Condition="'$(_BuildTargetAbis)' == ''">
<Output TaskParameter="Value" PropertyName="_BuildTargetAbis"/>
</CreateProperty>
Expand Down Expand Up @@ -2311,7 +2322,7 @@ because xbuild doesn't support framework reference assemblies.
</Target>


<Target Name="_ResolveAndroidSigningKey" DependsOnTargets="_ResolveMonoAndroidSdks">
<Target Name="_ResolveAndroidSigningKey" DependsOnTargets="$(_OnResolveMonoAndroidSdks)">
<!-- would use a PropertyGroup here but xbuild doesn't support it -->
<CreateProperty Value="$(_ApkDebugKeyStore)" Condition="'$(AndroidKeyStore)'!='True'">
<Output TaskParameter="Value" PropertyName="_ApkKeyStore"/>
Expand Down Expand Up @@ -2430,7 +2441,7 @@ because xbuild doesn't support framework reference assemblies.
<PropertyGroup>
<_BuildApkDependsOnTargets>
Build
;_ResolveMonoAndroidSdks
;$(_OnResolveMonoAndroidSdks)
;_ValidateAndroidPackageProperties
;_BuildApkEmbed
</_BuildApkDependsOnTargets>
Expand Down