Commit 4a5b737b authored by Martin Finkel's avatar Martin Finkel

Rename Android project to avoid namespace clashes

parent 470dc5a4
......@@ -10,8 +10,8 @@
<TemplateGuid>{84dd83c5-0fe3-4294-9419-09e7c8ba324f}</TemplateGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>LibVLCSharp.Android</RootNamespace>
<AssemblyName>LibVLCSharp.Android</AssemblyName>
<RootNamespace>LibVLCSharp.Android.Sample</RootNamespace>
<AssemblyName>LibVLCSharp.Android.Sample</AssemblyName>
<FileAlignment>512</FileAlignment>
<AndroidApplication>True</AndroidApplication>
<AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
......@@ -35,6 +35,9 @@
<AndroidUseSharedRuntime>True</AndroidUseSharedRuntime>
<AndroidLinkMode>None</AndroidLinkMode>
<EmbedAssembliesIntoApk>False</EmbedAssembliesIntoApk>
<AotAssemblies>false</AotAssemblies>
<EnableLLVM>false</EnableLLVM>
<BundleAssemblies>false</BundleAssemblies>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>PdbOnly</DebugType>
......
using System;
using Android.App;
using Android.App;
using Android.OS;
using Android.Views;
using Android.Widget;
using VideoView = LibVLCSharp.Platforms.Android.VideoView;
using LibVLCSharp.Shared;
using LibVLCSharp.Android.Sample;
namespace LibVLCSharp.Android
{
......
......@@ -9,9 +9,9 @@
// </auto-generated>
//------------------------------------------------------------------------------
[assembly: global::Android.Runtime.ResourceDesignerAttribute("LibVLCSharp.Android.Resource", IsApplication=true)]
[assembly: global::Android.Runtime.ResourceDesignerAttribute("LibVLCSharp.Android.Sample.Resource", IsApplication=true)]
namespace LibVLCSharp.Android
namespace LibVLCSharp.Android.Sample
{
......
......@@ -41,7 +41,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gestures.iOS", "Gestures\Ge
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MinimalPlayback", "MinimalPlayback", "{C6916887-253A-4D85-A8EF-424A5FF827F3}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibVLCSharp.Android", "MinimalPlayback\LibVLCSharp.Android\LibVLCSharp.Android.csproj", "{3BC0AC7E-3B3B-4D3F-9CC0-B2BDECC460A6}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibVLCSharp.Android.Sample", "MinimalPlayback\LibVLCSharp.Android\LibVLCSharp.Android.Sample.csproj", "{3BC0AC7E-3B3B-4D3F-9CC0-B2BDECC460A6}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibVLCSharp.WPF.Sample", "MinimalPlayback\LibVLCSharp.WPF.Sample\LibVLCSharp.WPF.Sample.csproj", "{7D7F9419-5F05-41E2-95D4-559C5533C25A}"
EndProject
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment