Update sample settings

Baseflow · Oct 8, 2019 · 8615f0b · 8615f0b
1 parent df44342
commit 8615f0b
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/Directory.build.targets b/Directory.build.targets
@@ -27,7 +27,6 @@
  <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
  <AndroidResgenClass>Resource</AndroidResgenClass>
  <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
- <AndroidSdkBuildToolsVersion Condition="'$(AndroidSdkBuildToolsVersion)' == ''">28.0.3</AndroidSdkBuildToolsVersion>
  <AndroidDexTool>d8</AndroidDexTool>
  <AndroidLinkTool>r8</AndroidLinkTool>
  </PropertyGroup>

diff --git a/Samples/Cast/ExoPlayer.CastDemo.csproj b/Samples/Cast/ExoPlayer.CastDemo.csproj
@@ -44,12 +44,15 @@
  </MandroidI18n>
  <Debugger>Xamarin</Debugger>
  <DevInstrumentationEnabled>True</DevInstrumentationEnabled>
- <AndroidEnableMultiDex>true</AndroidEnableMultiDex>
+ <AndroidEnableMultiDex>false</AndroidEnableMultiDex>
  <AotAssemblies>false</AotAssemblies>
  <EnableLLVM>false</EnableLLVM>
  <BundleAssemblies>false</BundleAssemblies>
  <JavaMaximumHeapSize>1G</JavaMaximumHeapSize>
  <AndroidUseSharedRuntime>true</AndroidUseSharedRuntime>
+ <AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>
+ <AndroidUseAapt2>true</AndroidUseAapt2>
+ <AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
  <DebugType>full</DebugType>
@@ -61,6 +64,10 @@
  <AotAssemblies>false</AotAssemblies>
  <EnableLLVM>false</EnableLLVM>
  <BundleAssemblies>false</BundleAssemblies>
+ <AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>
+ <AndroidUseAapt2>true</AndroidUseAapt2>
+ <AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>
+ <JavaMaximumHeapSize>1G</JavaMaximumHeapSize>
  </PropertyGroup>
  <PropertyGroup>
  <AndroidErrorOnCustomJavaObject>false</AndroidErrorOnCustomJavaObject>

diff --git a/Samples/Main/ExoPlayer.Demo.csproj b/Samples/Main/ExoPlayer.Demo.csproj
@@ -47,10 +47,13 @@
  <AndroidUseSharedRuntime>true</AndroidUseSharedRuntime>
  <JavaMaximumHeapSize>1G</JavaMaximumHeapSize>
  <AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
- <AndroidEnableMultiDex>true</AndroidEnableMultiDex>
+ <AndroidEnableMultiDex>false</AndroidEnableMultiDex>
  <AotAssemblies>false</AotAssemblies>
  <EnableLLVM>false</EnableLLVM>
  <BundleAssemblies>false</BundleAssemblies>
+ <AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>
+ <AndroidUseAapt2>true</AndroidUseAapt2>
+ <AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
  <DebugType>full</DebugType>
@@ -59,6 +62,13 @@
  <DefineConstants>TRACE</DefineConstants>
  <ErrorReport>prompt</ErrorReport>
  <WarningLevel>4</WarningLevel>
+ <AotAssemblies>false</AotAssemblies>
+ <EnableLLVM>false</EnableLLVM>
+ <AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>
+ <BundleAssemblies>false</BundleAssemblies>
+ <AndroidUseAapt2>true</AndroidUseAapt2>
+ <JavaMaximumHeapSize>1G</JavaMaximumHeapSize>
+ <AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>
  </PropertyGroup>
  <PropertyGroup>
  <AndroidErrorOnCustomJavaObject>false</AndroidErrorOnCustomJavaObject>