Android: bspatch integration

Author: ofalvai

.github/workflows/ci-test.yml

@@ -103,7 +103,18 @@ jobs:
           target: google_apis
           arch: x86
           disable-animations: true
-          script: npm run ${{ matrix.test-command }}
+          # connectedAndroidTest is included here (rather than a separate job or step) to reuse
+          # this job's already-booted emulator, even though it means it runs once per matrix
+          # variant. The android-emulator-runner action has no post-cleanup step, so a second
+          # step would boot and tear down a second emulator; ::group:: markers keep the two
+          # test runs visually separated in the Actions log instead.
+          script: |
+            echo "::group::Instrumented tests"
+            (cd android && ./gradlew :app:connectedAndroidTest)
+            echo "::endgroup::"
+            echo "::group::E2E tests"
+            npm run ${{ matrix.test-command }}
+            echo "::endgroup::"
 
   ios-test:
     needs: lint

.gitignore

@@ -196,6 +196,9 @@ Examples/testapp_rn
 # Android debug build files (conflict ignoring #Visual Studio files)
 !android/app/src/debug/
 
+# CMake/NDK build cache for android/app/src/main/cpp
+android/app/.cxx
+
 # iOS Simulator crash reports swept up from failed test runs (see test/test.ts)
 test/crash-logs/
 

.npmignore

@@ -42,8 +42,11 @@ test/
 # Remove after this framework is published on NPM
 code-push-plugin-testing-framework/
 
-# Android build artifacts and Android Studio bits
+# Android build artifacts, test sources and Android Studio bits
 android/app/build
+android/app/.cxx
+android/app/src/test
+android/app/src/androidTest
 android/local.properties
 android/.gradle
 android/**/*.iml

android/app/build.gradle

@@ -47,6 +47,21 @@ android {
         versionCode 1
         versionName "1.0"
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", IS_NEW_ARCHITECTURE_ENABLED.toString()
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+
+        externalNativeBuild {
+            cmake {
+                abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
+            }
+        }
+    }
+
+    externalNativeBuild {
+        cmake {
+            path "src/main/cpp/CMakeLists.txt"
+            version "3.22.1"
+        }
     }
 
     lintOptions {
@@ -81,4 +96,8 @@ dependencies {
     implementation 'com.nimbusds:nimbus-jose-jwt:9.37.3'
 
     testImplementation 'junit:junit:4.13.2'
+
+    androidTestImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
+    androidTestImplementation 'androidx.test:runner:1.6.2'
 }

android/app/src/androidTest/assets/bad_header/old.dat

@@ -0,0 +1,2 @@
+Irrelevant content - old.dat just needs to open successfully so the
+test reaches the diff-header check this fixture is actually exercising.

android/app/src/androidTest/assets/bad_header/patch.bsdiff

@@ -0,0 +1,25 @@
+function greet(name) {
+  console.log("Hello there, " + name + "!");
+  return "Hello there, " + name + "!";
+}
+
+function farewell(name) {
+  console.log("Goodbye, " + name + ".");
+  return "Goodbye, " + name + ".";
+}
+
+function shout(name) {
+  console.log("HEY, " + name.toUpperCase() + "!!!");
+  return "HEY, " + name.toUpperCase() + "!!!";
+}
+
+var VERSION = "1.1.0";
+var BUILD_NUMBER = 43;
+
+module.exports = {
+  greet: greet,
+  farewell: farewell,
+  shout: shout,
+  VERSION: VERSION,
+  BUILD_NUMBER: BUILD_NUMBER,
+};

android/app/src/androidTest/assets/basic/new.dat

@@ -0,0 +1,19 @@
+function greet(name) {
+  console.log("Hello, " + name + "!");
+  return "Hello, " + name + "!";
+}
+
+function farewell(name) {
+  console.log("Goodbye, " + name + ".");
+  return "Goodbye, " + name + ".";
+}
+
+var VERSION = "1.0.0";
+var BUILD_NUMBER = 42;
+
+module.exports = {
+  greet: greet,
+  farewell: farewell,
+  VERSION: VERSION,
+  BUILD_NUMBER: BUILD_NUMBER,
+};

android/app/src/androidTest/assets/basic/old.dat

@@ -0,0 +1,3 @@
+Everything in this file is new: the old side is a zero-byte file, so
+the whole patch body is a literal insert with no copy-from-old control
+entries at all.