Skip to content

[Xamarin.Android.Build.Tasks] copy all assembles to android/assets/shrunk #3950

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
jonpryor merged 1 commit into from
Nov 25, 2019
Merged

[Xamarin.Android.Build.Tasks] copy all assembles to android/assets/shrunk #3950

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
48 changes: 35 additions & 13 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 @@ -2041,6 +2041,30 @@ because xbuild doesn't support framework reference assemblies.
<Output TaskParameter="Include" ItemName="_ResolvedFrameworkAssemblies" />
</CreateItem>

<CreateItem
Include="@(_ResolvedAssemblies)"
Condition="'$(AndroidLinkMode)' == 'None' OR '$(AndroidUseSharedRuntime)' == 'true'">
<Output TaskParameter="Include" ItemName="_ShrunkAssemblies" />
</CreateItem>

<CreateItem
Include="@(_ResolvedAssemblies->'$(MonoAndroidIntermediateAssemblyDir)shrunk\%(Filename)%(Extension)')"
Condition="'$(AndroidLinkMode)' != 'None' AND '$(AndroidUseSharedRuntime)' != 'true'">
<Output TaskParameter="Include" ItemName="_ShrunkAssemblies" />
</CreateItem>

<CreateItem
Include="@(_ResolvedUserAssemblies)"
Condition="'$(AndroidLinkMode)' == 'None' OR '$(AndroidUseSharedRuntime)' == 'true'">
<Output TaskParameter="Include" ItemName="_ShrunkUserAssemblies" />
</CreateItem>

<CreateItem
Include="@(_ResolvedUserAssemblies->'$(MonoAndroidIntermediateAssemblyDir)shrunk\%(Filename)%(Extension)')"
Condition="'$(AndroidLinkMode)' != 'None' AND '$(AndroidUseSharedRuntime)' != 'true'">
<Output TaskParameter="Include" ItemName="_ShrunkUserAssemblies" />
</CreateItem>

<CreateItem
Include="@(_ResolvedFrameworkAssemblies)"
Condition="'$(AndroidLinkMode)' == 'None' OR '$(AndroidUseSharedRuntime)' == 'true'">
Expand Down Expand Up @@ -2520,20 +2544,19 @@ because xbuild doesn't support framework reference assemblies.
Condition="'$(AndroidLinkMode)' != 'None' AND '$(AndroidUseSharedRuntime)' != 'true'">

<!-- Make a copy of every assembly into assets\shrunk -->
<Copy
SourceFiles="@(_ResolvedFrameworkAssemblies)"
DestinationFiles="@(_ShrunkFrameworkAssemblies)"
SkipUnchangedFiles="true" />
<CopyIfChanged
SourceFiles="@(_ResolvedAssemblies)"
DestinationFiles="@(_ShrunkAssemblies)" />

<CopyIfChanged
SourceFiles="@(_ResolvedFrameworkAssemblies->'%(Identity).config')"
DestinationFiles="@(_ShrunkFrameworkAssemblies->'%(Identity).config')" />
SourceFiles="@(_ResolvedAssemblies->'%(Identity).config')"
DestinationFiles="@(_ShrunkAssemblies->'%(Identity).config')" />

<!-- Shrink Mono.Android.dll by removing attribute only needed for GenerateJavaStubs -->
<RemoveRegisterAttribute
Condition="'$(AndroidLinkMode)' != 'None' AND '$(AndroidUseSharedRuntime)' != 'true'"
Deterministic="$(Deterministic)"
ShrunkFrameworkAssemblies="@(_ShrunkFrameworkAssemblies)" />
ShrunkFrameworkAssemblies="@(_ShrunkAssemblies)" />

<MakeDir Directories="$(MonoAndroidIntermediateAssemblyDir)shrunk" />
<Touch Files="$(_RemoveRegisterFlag)" AlwaysCreate="true" />
Expand Down Expand Up @@ -2678,8 +2701,7 @@ because xbuild doesn't support framework reference assemblies.
<_BuildApkEmbedInputs>
$(MSBuildAllProjects)
;$(_PackagedResources)
;@(_ResolvedUserAssemblies)
;@(_ShrunkFrameworkAssemblies)
;@(_ShrunkAssemblies)
;@(AndroidNativeLibrary)
;@(_DexFile)
;$(_AndroidBuildPropertiesCache)
Expand Down Expand Up @@ -2717,7 +2739,7 @@ because xbuild doesn't support framework reference assemblies.
AndroidSequencePointsMode="$(_SequencePointsMode)"
AotAdditionalArguments="$(AndroidAotAdditionalArguments)"
ExtraAotOptions="$(AndroidExtraAotOptions)"
ResolvedAssemblies="@(_ResolvedUserAssemblies);@(_ShrunkFrameworkAssemblies)"
ResolvedAssemblies="@(_ShrunkAssemblies)"
AotOutputDirectory="$(_AndroidAotBinDirectory)"
IntermediateAssemblyDir="$(MonoAndroidIntermediateAssemblyDir)"
LinkMode="$(AndroidLinkMode)"
Expand All @@ -2742,7 +2764,7 @@ because xbuild doesn't support framework reference assemblies.
Condition="'$(BundleAssemblies)' == 'True'"
KeepTemp="$(AndroidMakeBundleKeepTemporaryFiles)"
AndroidNdkDirectory="$(_AndroidNdkDirectory)"
Assemblies="@(_ResolvedUserAssemblies);@(_AndroidResolvedSatellitePaths);@(_ShrunkFrameworkAssemblies)"
Assemblies="@(_ShrunkAssemblies);@(_AndroidResolvedSatellitePaths)"
IncludePath="$(MonoAndroidIncludeDirectory)"
SupportedAbis="@(_BuildTargetAbis)"
TempOutputPath="$(IntermediateOutputPath)"
Expand All @@ -2759,7 +2781,7 @@ because xbuild doesn't support framework reference assemblies.
BundleAssemblies="$(BundleAssemblies)"
BundleNativeLibraries="$(_BundleResultNativeLibraries)"
EmbedAssemblies="$(EmbedAssembliesIntoApk)"
ResolvedUserAssemblies="@(_ResolvedUserAssemblies);@(_AndroidResolvedSatellitePaths)"
ResolvedUserAssemblies="@(_ShrunkUserAssemblies);@(_AndroidResolvedSatellitePaths)"
ResolvedFrameworkAssemblies="@(_ShrunkFrameworkAssemblies)"
NativeLibraries="@(AndroidNativeLibrary)"
ApplicationSharedLibraries="@(_ApplicationSharedLibrary)"
Expand Down Expand Up @@ -2788,7 +2810,7 @@ because xbuild doesn't support framework reference assemblies.
BundleAssemblies="$(BundleAssemblies)"
BundleNativeLibraries="$(_BundleResultNativeLibraries)"
EmbedAssemblies="$(EmbedAssembliesIntoApk)"
ResolvedUserAssemblies="@(_ResolvedUserAssemblies);@(_AndroidResolvedSatellitePaths)"
ResolvedUserAssemblies="@(_ShrunkUserAssemblies);@(_AndroidResolvedSatellitePaths)"
ResolvedFrameworkAssemblies="@(_ShrunkFrameworkAssemblies)"
NativeLibraries="@(AndroidNativeLibrary)"
ApplicationSharedLibraries="@(_ApplicationSharedLibrary)"
Expand Down