Skip to content

Commit 925fe3f

Browse files
author
Stewart Miles
committed
Fixed the Android Resolver integration test.
Fixed the mainTemplate.gradle patching integration tests after they were broken by the introduction of a flag to disable the functionality in change Id75158333fdb4ad6a9ac97f11465458637968da9. Change-Id: Ic0d08fbeb74089236b22908ee82a31cc1db6dccd
1 parent c3be323 commit 925fe3f

File tree

1 file changed

+21
-0
lines changed
  • source/PlayServicesResolver/test/resolve_async/Assets/PlayServicesResolver/Editor

1 file changed

+21
-0
lines changed

source/PlayServicesResolver/test/resolve_async/Assets/PlayServicesResolver/Editor/TestResolveAsync.cs

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -896,6 +896,25 @@ private static void Resolve(string androidBuildSystem, bool exportProject,
896896
}
897897
}
898898

899+
/// <summary>
900+
/// Accesses the PatchMainTemplateGradle setting.
901+
/// </summary>
902+
private static bool PatchMainTemplateGradle {
903+
get {
904+
return (bool)Google.VersionHandler.FindClass(
905+
null, "GooglePlayServices.SettingsDialog").GetProperty(
906+
"PatchMainTemplateGradle",
907+
BindingFlags.Static | BindingFlags.NonPublic).GetValue(null, null);
908+
}
909+
910+
set {
911+
Google.VersionHandler.FindClass(
912+
null, "GooglePlayServices.SettingsDialog").GetProperty(
913+
"PatchMainTemplateGradle",
914+
BindingFlags.Static | BindingFlags.NonPublic).SetValue(null, value, null);
915+
}
916+
}
917+
899918
/// <summary>
900919
/// Resolve for Gradle using a template .gradle file.
901920
/// </summary>
@@ -920,11 +939,13 @@ private static void ResolveWithGradleTemplate(string gradleTemplate,
920939
if (deleteGradleTemplate) cleanUpFiles.Add(GRADLE_TEMPLATE_ENABLED);
921940
if (otherExpectedFiles != null) cleanUpFiles.AddRange(otherExpectedFiles);
922941
Action cleanUpTestCase = () => {
942+
PatchMainTemplateGradle = false;
923943
foreach (var filename in cleanUpFiles) {
924944
if (File.Exists(filename)) File.Delete(filename);
925945
}
926946
};
927947
try {
948+
PatchMainTemplateGradle = true;
928949
File.Copy(gradleTemplate, GRADLE_TEMPLATE_ENABLED);
929950
Resolve("Gradle", false, expectedAssetsDir, null, filesToIgnore, testCase,
930951
(TestCaseResult testCaseResult) => {

0 commit comments

Comments
 (0)