Skip to content

Commit 726aab2

Browse files
committed
Remove Java.Interop.TypeNameMappings project, it is gone.
This fixes JavaNativeTypeManager.PackageNamingPolicy initialization issue that blocks the entire use of package naming policy customization (one in Xamarin.Android.Build.Tasks.dll is initialized in GenerateJavaStubs, while the actual use in Java.Interop.Tools.JavaCallableWrappers.dll never gets initialized). Added test for PackageNamingPolicy.Lowercase. Deployed apps work fine too.
1 parent 347fedf commit 726aab2

File tree

5 files changed

+17
-6
lines changed

5 files changed

+17
-6
lines changed

Xamarin.Android.sln

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Java.Interop.NamingCustomAt
2727
EndProject
2828
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Xamarin.Android.NamingCustomAttributes", "src\Xamarin.Android.NamingCustomAttributes\Xamarin.Android.NamingCustomAttributes.shproj", "{74598F5C-B8CC-4CE6-8EE2-AB9CA1400076}"
2929
EndProject
30-
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Java.Interop.Tools.TypeNameMappings", "external\Java.Interop\src\Java.Interop.Tools.TypeNameMappings\Java.Interop.Tools.TypeNameMappings.shproj", "{E706B6F2-5562-4765-8F07-8CF84A797B30}"
31-
EndProject
3230
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Android.Tools.Aidl", "src\Xamarin.Android.Tools.Aidl\Xamarin.Android.Tools.Aidl.csproj", "{D27AD8F7-7710-40BE-B03B-55EFBEC13C44}"
3331
EndProject
3432
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Android.Build.Tasks", "src\Xamarin.Android.Build.Tasks\Xamarin.Android.Build.Tasks.csproj", "{3F1F2F50-AF1A-4A5A-BEDB-193372F068D7}"
@@ -544,7 +542,6 @@ Global
544542
{D14A1B5C-2060-4930-92BE-F7190256C735} = {04E3E11E-B47D-4599-8AFC-50515A95E715}
545543
{FE789F04-5E95-42C5-AEF1-E33F8DF06B3F} = {04E3E11E-B47D-4599-8AFC-50515A95E715}
546544
{74598F5C-B8CC-4CE6-8EE2-AB9CA1400076} = {04E3E11E-B47D-4599-8AFC-50515A95E715}
547-
{E706B6F2-5562-4765-8F07-8CF84A797B30} = {04E3E11E-B47D-4599-8AFC-50515A95E715}
548545
{D27AD8F7-7710-40BE-B03B-55EFBEC13C44} = {04E3E11E-B47D-4599-8AFC-50515A95E715}
549546
{3F1F2F50-AF1A-4A5A-BEDB-193372F068D7} = {04E3E11E-B47D-4599-8AFC-50515A95E715}
550547
{B17475BC-45A2-47A3-B8FC-62F3A0959EE0} = {04E3E11E-B47D-4599-8AFC-50515A95E715}

external/Java.Interop

src/Mono.Android/Mono.Android.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@
7676
<Private>False</Private>
7777
</Reference>
7878
</ItemGroup>
79-
<Import Project="..\..\external\Java.Interop\src\Java.Interop.Tools.TypeNameMappings\Java.Interop.Tools.TypeNameMappings.projitems" Label="Shared" Condition="Exists('..\..\external\Java.Interop\src\Java.Interop.Tools.TypeNameMappings\Java.Interop.Tools.TypeNameMappings.projitems')" />
8079
<Import Project="..\Xamarin.Android.NamingCustomAttributes\Xamarin.Android.NamingCustomAttributes.projitems" Label="Shared" Condition="Exists('..\Xamarin.Android.NamingCustomAttributes\Xamarin.Android.NamingCustomAttributes.projitems')" />
8180
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
8281
<PropertyGroup>
@@ -325,6 +324,9 @@
325324
<Compile Include="Xamarin.Android.Net\AuthModuleBasic.cs" />
326325
<Compile Include="Xamarin.Android.Net\AuthModuleDigest.cs" />
327326
<Compile Include="Xamarin.Android.Net\IAndroidAuthenticationModule.cs" />
327+
<Compile Include="..\..\external\Java.Interop\src\Java.Interop.Tools.TypeNameMappings\Java.Interop.Tools.TypeNameMappings\JavaNativeTypeManager.cs">
328+
<Link>JavaNativeTypeManager.cs</Link>
329+
</Compile>
328330
</ItemGroup>
329331
<ItemGroup>
330332
<ProjectReference Include="..\..\build-tools\api-merge\api-merge.csproj">

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/PackagingTest.cs

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,5 +181,18 @@ public void CheckIncludedNativeLibraries ()
181181
}
182182
}
183183
}
184+
185+
[Test]
186+
public void ExplicitPackageNamingPolicy ()
187+
{
188+
var proj = new XamarinAndroidApplicationProject ();
189+
proj.SetProperty (proj.DebugProperties, "AndroidPackageNamingPolicy", "Lowercase");
190+
using (var b = CreateApkBuilder (Path.Combine ("temp", TestContext.CurrentContext.Test.Name))) {
191+
b.Verbosity = Microsoft.Build.Framework.LoggerVerbosity.Diagnostic;
192+
Assert.IsTrue (b.Build (proj), "build failed");
193+
var text = b.Output.GetIntermediaryAsText (b.Output.IntermediateOutputPath, Path.Combine ("android", "src", "unnamedproject", "MainActivity.java"));
194+
Assert.IsTrue (text.Contains ("package unnamedproject;"), "expected package not found in the source.");
195+
}
196+
}
184197
}
185198
}

src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
</PropertyGroup>
1515
<Import Project="..\..\Configuration.props" />
1616
<Import Project="..\Xamarin.Android.NamingCustomAttributes\Xamarin.Android.NamingCustomAttributes.projitems" Label="Shared" Condition="Exists('..\Xamarin.Android.NamingCustomAttributes\Xamarin.Android.NamingCustomAttributes.projitems')" />
17-
<Import Project="..\..\external\Java.Interop\src\Java.Interop.Tools.TypeNameMappings\Java.Interop.Tools.TypeNameMappings.projitems" Label="Shared" Condition="Exists('..\..\external\Java.Interop\src\Java.Interop.Tools.TypeNameMappings\Java.Interop.Tools.TypeNameMappings.projitems')" />
1817
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1918
<DebugSymbols>True</DebugSymbols>
2019
<DebugType>full</DebugType>

0 commit comments

Comments
 (0)