Skip to content

[Xamarin.Android.Build.Tasks] remove the android\assets\shrunk directory #3925

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
jonathanpeppers wants to merge 1 commit into from
Closed

[Xamarin.Android.Build.Tasks] remove the android\assets\shrunk directory #3925

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion .external
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
xamarin/monodroid:master@1b907d680cc6561dcfaddc6f997d2f6ff5456644
xamarin/monodroid:shrunkframeworkassemblies@326b7fc28ebfc0e630e3383ea5061a3337efe986
mono/mono:2019-08@8946e49a974ea8b75fe5b8b7e93ffd4571521a85
4 changes: 2 additions & 2 deletions src/Xamarin.Android.Build.Tasks/Tasks/RemoveRegisterAttribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ public class RemoveRegisterAttribute : AndroidTask
const string RegisterAttribute = "Android.Runtime.RegisterAttribute";

[Required]
public ITaskItem[] ShrunkFrameworkAssemblies { get; set; }
public ITaskItem[] FrameworkAssemblies { get; set; }

public bool Deterministic { get; set; }

public override bool RunTask ()
{
// Find Mono.Android.dll
var mono_android = ShrunkFrameworkAssemblies.First (f => Path.GetFileNameWithoutExtension (f.ItemSpec) == "Mono.Android").ItemSpec;
var mono_android = FrameworkAssemblies.First (f => Path.GetFileNameWithoutExtension (f.ItemSpec) == "Mono.Android").ItemSpec;
var writerParameters = new WriterParameters {
DeterministicMvid = Deterministic,
};
Expand Down
41 changes: 8 additions & 33 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 @@ -1158,7 +1158,6 @@ because xbuild doesn't support framework reference assemblies.
<_AndroidLinkFlag>$(IntermediateOutputPath)link.flag</_AndroidLinkFlag>
<_AndroidApkPerAbiFlagFile>$(IntermediateOutputPath)android\bin\apk_per_abi.flag</_AndroidApkPerAbiFlagFile>
<_AndroidDebugKeyStoreFlag>$(IntermediateOutputPath)android_debug_keystore.flag</_AndroidDebugKeyStoreFlag>
<_RemoveRegisterFlag>$(MonoAndroidIntermediateAssemblyDir)shrunk\shrunk.flag</_RemoveRegisterFlag>
<_AcwMapFile>$(IntermediateOutputPath)acw-map.txt</_AcwMapFile>
<_CustomViewMapFile>$(IntermediateOutputPath)customview-map.txt</_CustomViewMapFile>
<_AndroidTypeMappingJavaToManaged>$(IntermediateOutputPath)android\typemap.jm</_AndroidTypeMappingJavaToManaged>
Expand Down Expand Up @@ -2041,18 +2040,6 @@ because xbuild doesn't support framework reference assemblies.
<Output TaskParameter="Include" ItemName="_ResolvedFrameworkAssemblies" />
</CreateItem>

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

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

<CreateItem
Include="@(_ResolvedUserAssemblies)"
Condition="'%(_ResolvedUserAssemblies.TargetFrameworkIdentifier)' == 'MonoAndroid' Or '%(_ResolvedUserAssemblies.HasMonoAndroidReference)' == 'True'">
Expand Down Expand Up @@ -2516,27 +2503,16 @@ because xbuild doesn't support framework reference assemblies.
<Target Name="_RemoveRegisterAttribute"
DependsOnTargets="_PrepareAssemblies"
Inputs="$(_AndroidLinkFlag)"
Outputs="$(_RemoveRegisterFlag)"
Outputs="$(_AndroidStampDirectory)_RemoveRegisterAttribute.stamp"
Condition="'$(AndroidLinkMode)' != 'None' AND '$(AndroidUseSharedRuntime)' != 'true'">

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

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

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

<MakeDir Directories="$(MonoAndroidIntermediateAssemblyDir)shrunk" />
<Touch Files="$(_RemoveRegisterFlag)" AlwaysCreate="true" />
<Touch Files="$(_AndroidStampDirectory)_RemoveRegisterAttribute.stamp" AlwaysCreate="true" />
</Target>

<Target Name="_ResolveSatellitePaths"
Expand Down Expand Up @@ -2678,8 +2654,7 @@ because xbuild doesn't support framework reference assemblies.
<_BuildApkEmbedInputs>
$(MSBuildAllProjects)
;$(_PackagedResources)
;@(_ResolvedUserAssemblies)
;@(_ShrunkFrameworkAssemblies)
;@(_ResolvedAssemblies)
;@(AndroidNativeLibrary)
;@(_DexFile)
;$(_AndroidBuildPropertiesCache)
Expand Down Expand Up @@ -2717,7 +2692,7 @@ because xbuild doesn't support framework reference assemblies.
AndroidSequencePointsMode="$(_SequencePointsMode)"
AotAdditionalArguments="$(AndroidAotAdditionalArguments)"
ExtraAotOptions="$(AndroidExtraAotOptions)"
ResolvedAssemblies="@(_ResolvedUserAssemblies);@(_ShrunkFrameworkAssemblies)"
ResolvedAssemblies="@(_ResolvedAssemblies)"
AotOutputDirectory="$(_AndroidAotBinDirectory)"
IntermediateAssemblyDir="$(MonoAndroidIntermediateAssemblyDir)"
LinkMode="$(AndroidLinkMode)"
Expand All @@ -2742,7 +2717,7 @@ because xbuild doesn't support framework reference assemblies.
Condition="'$(BundleAssemblies)' == 'True'"
KeepTemp="$(AndroidMakeBundleKeepTemporaryFiles)"
AndroidNdkDirectory="$(_AndroidNdkDirectory)"
Assemblies="@(_ResolvedUserAssemblies);@(_AndroidResolvedSatellitePaths);@(_ShrunkFrameworkAssemblies)"
Assemblies="@(_ResolvedAssemblies);@(_AndroidResolvedSatellitePaths)"
IncludePath="$(MonoAndroidIncludeDirectory)"
SupportedAbis="@(_BuildTargetAbis)"
TempOutputPath="$(IntermediateOutputPath)"
Expand All @@ -2760,7 +2735,7 @@ because xbuild doesn't support framework reference assemblies.
BundleNativeLibraries="$(_BundleResultNativeLibraries)"
EmbedAssemblies="$(EmbedAssembliesIntoApk)"
ResolvedUserAssemblies="@(_ResolvedUserAssemblies);@(_AndroidResolvedSatellitePaths)"
ResolvedFrameworkAssemblies="@(_ShrunkFrameworkAssemblies)"
ResolvedFrameworkAssemblies="@(_ResolvedFrameworkAssemblies)"
NativeLibraries="@(AndroidNativeLibrary)"
ApplicationSharedLibraries="@(_ApplicationSharedLibrary)"
AdditionalNativeLibraryReferences="@(_AdditionalNativeLibraryReferences)"
Expand Down Expand Up @@ -2789,7 +2764,7 @@ because xbuild doesn't support framework reference assemblies.
BundleNativeLibraries="$(_BundleResultNativeLibraries)"
EmbedAssemblies="$(EmbedAssembliesIntoApk)"
ResolvedUserAssemblies="@(_ResolvedUserAssemblies);@(_AndroidResolvedSatellitePaths)"
ResolvedFrameworkAssemblies="@(_ShrunkFrameworkAssemblies)"
ResolvedFrameworkAssemblies="@(_ResolvedFrameworkAssemblies)"
NativeLibraries="@(AndroidNativeLibrary)"
ApplicationSharedLibraries="@(_ApplicationSharedLibrary)"
AdditionalNativeLibraryReferences="@(_AdditionalNativeLibraryReferences)"
Expand Down