Fix JUnit testing for android (#8984)

* re-enable junit-testing * uuh it's that linker issue * Fine.. i'll just build it. * recusive submodules
mozilla-mobile · Jan 22, 2024 · fce17ec · fce17ec
1 parent b81ad66
commit fce17ec
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/taskcluster/kinds/test/junit.yml b/taskcluster/kinds/test/junit.yml
@@ -14,21 +14,19 @@ android-junit:
         kind: test
         platform: android/arm64-v8a
         tier: 1
-    dependencies:
-        build: build-android-arm64/debug
     fetches:
         toolchain: 
             - conda-android-arm64-6.2.4
-        build:
-            - artifact: android-build.zip
     run:
         using: run-task
         use-caches: true
         cwd: '{checkout}'
         command: >-
+          git submodule update --init --recursive;
           source $TASK_WORKDIR/fetches/bin/activate;
           conda-unpack;
-          cd $TASK_WORKDIR/fetches/android-build;
+          unset CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER;
+          ./scripts/android/cmake.sh -d;
+          cd .tmp/src/android-build/;
           ls;
-          (./gradlew test || true);
           ./gradlew test
diff --git a/taskcluster/kinds/test/kind.yml b/taskcluster/kinds/test/kind.yml
@@ -16,4 +16,4 @@ kind-dependencies:
 
 tasks-from:
     - taskgraph.yml
-#    - junit.yml
+    - junit.yml