Skip to content

Commit 5d0dc0d

Browse files
committed
Add UploadSharedObjectFilesTask and integrate it to NdkUploadTask
1 parent d310d51 commit 5d0dc0d

File tree

20 files changed

+225
-122
lines changed

20 files changed

+225
-122
lines changed

embrace-gradle-plugin-integration-tests/fixtures/ndk-upload-simple/build.gradle

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
import io.embrace.android.gradle.plugin.tasks.ndk.NdkUploadTask
2-
import io.embrace.android.gradle.plugin.network.EmbraceEndpoint
3-
import io.embrace.android.gradle.plugin.config.ProjectType
42

53
plugins {
64
id("java")
@@ -9,14 +7,10 @@ plugins {
97
}
108

119
project.tasks.register("testTask", NdkUploadTask) { task ->
12-
integrationTest.configureGradleUploadTask(project, task, EmbraceEndpoint.NDK, null)
13-
task.failBuildOnUploadErrors.set(true)
10+
integrationTest.configureEmbraceTask(task)
1411
task.generatedEmbraceResourcesDirectory.set(
1512
project.layout.buildDirectory.dir("generated-embrace-resources")
1613
)
17-
task.compressedSharedObjectFilesDirectory.set(
18-
project.layout.projectDirectory.dir("compressedSharedObjectFiles")
19-
)
2014
task.architecturesToHashedSharedObjectFilesMapJson.set(
2115
project.layout.projectDirectory.file("output.json")
2216
)

embrace-gradle-plugin-integration-tests/fixtures/ndk-upload-simple/input.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

embrace-gradle-plugin-integration-tests/fixtures/ndk-upload-simple/native-libs/fake-lib.so

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
import io.embrace.android.gradle.plugin.tasks.ndk.UploadSharedObjectFilesTask
2+
import io.embrace.android.gradle.plugin.network.EmbraceEndpoint
3+
4+
plugins {
5+
id("java")
6+
id("io.embrace.swazzler")
7+
id("io.embrace.android.testplugin")
8+
}
9+
10+
project.tasks.register("testTask", UploadSharedObjectFilesTask) { task ->
11+
integrationTest.configureGradleUploadTask(project, task, EmbraceEndpoint.NDK, null)
12+
task.failBuildOnUploadErrors.set(true)
13+
task.compressedSharedObjectFilesDirectory.set(
14+
project.layout.projectDirectory.dir("compressedSharedObjectFiles")
15+
)
16+
task.architecturesToHashedSharedObjectFilesMapJson.set(
17+
project.layout.projectDirectory.file("output.json")
18+
)
19+
}

embrace-gradle-plugin-integration-tests/fixtures/ndk-upload-simple/compressedSharedObjectFiles/arm64-v8a/libemb-crisps.so renamed to embrace-gradle-plugin-integration-tests/fixtures/upload-shared-object-files/compressedSharedObjectFiles/arm64-v8a/libemb-crisps.so

File renamed without changes.

embrace-gradle-plugin-integration-tests/fixtures/ndk-upload-simple/compressedSharedObjectFiles/arm64-v8a/libemb-donuts.so renamed to embrace-gradle-plugin-integration-tests/fixtures/upload-shared-object-files/compressedSharedObjectFiles/arm64-v8a/libemb-donuts.so

File renamed without changes.

embrace-gradle-plugin-integration-tests/fixtures/ndk-upload-simple/compressedSharedObjectFiles/armeabi-v7a/libemb-crisps.so renamed to embrace-gradle-plugin-integration-tests/fixtures/upload-shared-object-files/compressedSharedObjectFiles/armeabi-v7a/libemb-crisps.so

File renamed without changes.

embrace-gradle-plugin-integration-tests/fixtures/ndk-upload-simple/compressedSharedObjectFiles/armeabi-v7a/libemb-donuts.so renamed to embrace-gradle-plugin-integration-tests/fixtures/upload-shared-object-files/compressedSharedObjectFiles/armeabi-v7a/libemb-donuts.so

File renamed without changes.

embrace-gradle-plugin-integration-tests/fixtures/ndk-upload-simple/compressedSharedObjectFiles/x86/libemb-crisps.so renamed to embrace-gradle-plugin-integration-tests/fixtures/upload-shared-object-files/compressedSharedObjectFiles/x86/libemb-crisps.so

File renamed without changes.

embrace-gradle-plugin-integration-tests/fixtures/ndk-upload-simple/compressedSharedObjectFiles/x86/libemb-donuts.so renamed to embrace-gradle-plugin-integration-tests/fixtures/upload-shared-object-files/compressedSharedObjectFiles/x86/libemb-donuts.so

File renamed without changes.

0 commit comments

Comments
 (0)