Skip to content

Commit 72acb66

Browse files
committed
Fix Android Resolver integration tests
Primary fix test fails in Unity 2019 - If a dependency is added programmatically, remove "()" from the stack trace for consistent result across different versions of Unity. - Move libs/x86/libFirebaseCppApp-5.1.1.so to libs/unsupported/libFirebaseCppApp-5.1.1.so in firebase-app-unity-5.1.1.srcaar for consistent result across different versions of Unity, since x86 supported was removed from Unity 2019.3. - Set application id in the beginning of the test since default application id is different from different version of Unity. - Only test Internal Build System for Unity 2018 or lower since it is removed in 2019. Bug: 158860154 Change-Id: I82dced8dce668e78ec62b8db67d789fac23ce0ea
1 parent d2e211e commit 72acb66

File tree

15 files changed

+68
-29
lines changed

15 files changed

+68
-29
lines changed

source/AndroidResolver/test/AndroidResolverIntegrationTestsUnityProject/ExpectedArtifacts/NoExport/GradleTemplate/mainTemplate.gradle

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,17 @@ dependencies {
4848
// Android Resolver Dependencies Start
4949
compile 'com.android.support:support-annotations:26.1.0' // Assets/ExternalDependencyManager/Editor/TestDependencies.xml:4
5050
compile 'com.google.firebase:firebase-app-unity:5.1.1' // Assets/ExternalDependencyManager/Editor/TestDependencies.xml:10
51-
compile 'com.google.firebase:firebase-common:16.0.0' // Google.AndroidResolverIntegrationTests.SetupDependencies()
51+
compile 'com.google.firebase:firebase-common:16.0.0' // Google.AndroidResolverIntegrationTests.SetupDependencies
5252
// Android Resolver Dependencies End
5353
**DEPS**}
5454

55+
// Android Resolver Exclusions Start
56+
android {
57+
packagingOptions {
58+
exclude ('lib/unsupported/libFirebaseCppApp-5.1.1.so')
59+
}
60+
}
61+
// Android Resolver Exclusions End
5562
android {
5663
compileSdkVersion **APIVERSION**
5764
buildToolsVersion '**BUILDTOOLS**'

source/AndroidResolver/test/AndroidResolverIntegrationTestsUnityProject/ExpectedArtifacts/NoExport/GradleTemplateJetifier/mainTemplate.gradle

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,17 @@ dependencies {
5454
// Android Resolver Dependencies Start
5555
compile 'com.android.support:support-annotations:26.1.0' // Assets/ExternalDependencyManager/Editor/TestDependencies.xml:4
5656
compile 'com.google.firebase:firebase-app-unity:5.1.1' // Assets/ExternalDependencyManager/Editor/TestDependencies.xml:10
57-
compile 'com.google.firebase:firebase-common:16.0.0' // Google.AndroidResolverIntegrationTests.SetupDependencies()
57+
compile 'com.google.firebase:firebase-common:16.0.0' // Google.AndroidResolverIntegrationTests.SetupDependencies
5858
// Android Resolver Dependencies End
5959
**DEPS**}
6060

61+
// Android Resolver Exclusions Start
62+
android {
63+
packagingOptions {
64+
exclude ('lib/unsupported/libFirebaseCppApp-5.1.1.so')
65+
}
66+
}
67+
// Android Resolver Exclusions End
6168
android {
6269
compileSdkVersion **APIVERSION**
6370
buildToolsVersion '**BUILDTOOLS**'

source/AndroidResolver/test/AndroidResolverIntegrationTestsUnityProject/ExpectedArtifacts/NoExport/GradleTemplateLibrary/mainTemplate.gradle

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,17 @@ dependencies {
4848
// Android Resolver Dependencies Start
4949
compile 'com.android.support:support-annotations:26.1.0' // Assets/ExternalDependencyManager/Editor/TestDependencies.xml:4
5050
compile 'com.google.firebase:firebase-app-unity:5.1.1' // Assets/ExternalDependencyManager/Editor/TestDependencies.xml:10
51-
compile 'com.google.firebase:firebase-common:16.0.0' // Google.AndroidResolverIntegrationTests.SetupDependencies()
51+
compile 'com.google.firebase:firebase-common:16.0.0' // Google.AndroidResolverIntegrationTests.SetupDependencies
5252
// Android Resolver Dependencies End
5353
**DEPS**}
5454

55+
// Android Resolver Exclusions Start
56+
android {
57+
packagingOptions {
58+
exclude ('lib/unsupported/libFirebaseCppApp-5.1.1.so')
59+
}
60+
}
61+
// Android Resolver Exclusions End
5562
android {
5663
compileSdkVersion **APIVERSION**
5764
buildToolsVersion '**BUILDTOOLS**'

0 commit comments

Comments
 (0)