[Hermes] Android integration

.bazelrc

@@ -4,16 +4,14 @@ coverage --combined_report=lcov
 
 # TODO: Custom compiler version breaks embedded jdeps generator plugin - enable when removing custom kotlinc
 build --@rules_kotlin//kotlin/settings:jvm_emit_jdeps=False
+build --cxxopt=-std=c++17
 
 # Android databinding flags
-# TODO: Verify the follow doesn't break host compil
-build --android_crosstool_top=@androidndk//:toolchain
-build --experimental_android_databinding_v2
-build --android_databinding_use_v3_4_args
-build --android_databinding_use_androidx
-build --experimental_google_legacy_api
-query --experimental_google_legacy_api
-sync --experimental_google_legacy_api
+common --android_crosstool_top=@androidndk//:toolchain
+common --experimental_android_databinding_v2
+common --android_databinding_use_v3_4_args
+common --android_databinding_use_androidx
+common --experimental_google_legacy_api
 
 # Android demo app flags
 build --noincremental_dexing --fat_apk_cpu=armeabi-v7a,arm64-v8a,x86,x86_64
@@ -46,16 +44,17 @@ coverage --remote_download_toplevel
 coverage --remote_timeout=3600
 coverage --build_metadata=REPO_URL=https://github.com/player-ui/player.git
 
-build:ci --build_metadata=ROLE=CI --workspace_status_command=./scripts/workspace-status.sh
+common:ci --build_metadata=ROLE=CI --workspace_status_command=./scripts/workspace-status.sh
 
 # Circle xlarge has 8 CPU cores/16GB mem
-build:ci --local_cpu_resources=8
-build:ci --local_ram_resources=15000
-build:ci --config="release"
+common:ci --local_cpu_resources=8
+common:ci --local_ram_resources=15000
+common:ci --config="release"
 # Circle macos.m1.large.gen1 8 cores 12gb ram
 common:ci-mac --config=ci --local_cpu_resources=8 --local_ram_resources=11000
 
 build:release --stamp --workspace_status_command=./scripts/workspace-status.sh
+build:release --//:cmake_build_type=MinSizeRel
 
 # Cache action outputs on disk so they persist across output_base and bazel shutdown (eg. changing branches)
 # build --disk_cache=~/.cache/bazel-disk-cache

.circleci/config.yml

@@ -16,7 +16,7 @@ orbs:
 executors:
   base:
     docker:
-      - image: docker.io/playerui/bazel-docker
+      - image: docker.io/playerui/bazel-docker:11
     working_directory: ~/player
     resource_class: xlarge
     environment:
@@ -114,7 +114,7 @@ jobs:
     steps:
       - attach_workspace:
           at: ~/player
-      # need to filter because //android/demo rules dont resolve
+
       - run: bazel build --config=ci -- $(bazel query 'filter("native_bundle$", //...)')
 
       - save_cache:
@@ -237,6 +237,7 @@ jobs:
 
       - run: |
           bazel test --config=ci -- $(bazel query 'kind(".*_test", //...) except filter("ios|swiftui", //...)') -//android/demo:android_instrumentation_test
+          bazel test --config=ci --//android/player:runtime=hermes -- $(bazel query 'kind(".*_test", //...) except filter("ios|swiftui", //...)') -//android/demo:android_instrumentation_test
 
       - run:
           when: always
@@ -292,7 +293,9 @@ jobs:
           command: |
             circle-android wait-for-boot
 
-      - run: bazel test --config=ci -- //android/demo:android_instrumentation_test
+      - run: |
+          bazel test --config=ci -- //android/demo:android_instrumentation_test
+          bazel test --config=ci --//android/player:runtime=hermes -- //android/demo:android_instrumentation_test
 
       - run:
           when: always
@@ -427,7 +430,6 @@ workflows:
             - Publish
           requires:
             - build-trunk
-            - build-ios-trunk
 
       - test:
           name: test-trunk

.gitignore

@@ -26,6 +26,7 @@ typedoc
 /.idea/
 /.ijwb/
 /.aswb/
+/.clwb/
 /.project
 /.settings
 /.vscode/

BUILD.bazel

@@ -1,10 +1,10 @@
-load("@rules_player//ios:defs.bzl", "assemble_pod", "ios_publish")
-load("@rules_player//internal:defs.bzl", "stamp")
-load("@npm//:defs.bzl", "npm_link_all_packages")
 load("@aspect_rules_js//js:defs.bzl", "js_library")
 load("@bazel_gazelle//:def.bzl", "gazelle_binary", "gazelle")
+load("@bazel_skylib//rules:common_settings.bzl", "string_flag")
+load("@npm//:defs.bzl", "npm_link_all_packages")
+load("@rules_player//internal:defs.bzl", "stamp")
+load("@rules_player//ios:defs.bzl", "assemble_pod", "ios_publish")
 load("@rules_swift_package_manager//swiftpkg:defs.bzl", "swift_update_packages")
-load("@bazel_tools//tools/jdk:default_java_toolchain.bzl", "default_java_toolchain")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -90,14 +90,14 @@ stamp(
     name = "PlayerUI_Podspec",
     files = ["//:PlayerUI.podspec"],
     stable = True,
+    stamp = -1,
     substitutions = {
         "0.0.1-placeholder": "{STABLE_VERSION}",
     },
-    stamp = -1,
 )
 
 exports_files([
-    "PlayerUI.podspec"
+    "PlayerUI.podspec",
 ])
 
 assemble_pod(
@@ -286,3 +286,66 @@ java_plugin(
 )
 #SwiftLint
 exports_files([".swiftlint.yml"])
+
+# Native platform settings
+
+string_flag(
+    name = "cmake_build_type",
+    build_setting_default = "Debug",
+    make_variable = "CMAKE_BUILD_TYPE",
+    values = [
+        "Debug",
+        "Release",
+        "MinSizeRel",
+        "RelWithDebInfo",
+    ],
+)
+
+config_setting(
+    name = "cmake_build_type_debug",
+    flag_values = {
+        ":cmake_build_type": "Debug",
+    },
+)
+
+config_setting(
+    name = "cmake_build_type_release",
+    flag_values = {
+        ":cmake_build_type": "Release",
+    },
+)
+
+config_setting(
+    name = "cmake_build_type_minsizerel",
+    flag_values = {
+        ":cmake_build_type": "MinSizeRel",
+    },
+)
+
+config_setting(
+    name = "cmake_build_type_relwithdebinfo",
+    flag_values = {
+        ":cmake_build_type": "RelWithDebInfo",
+    },
+)
+
+# TODO: Enable platform support for detecting Android OS as well as cpu
+config_setting(
+    name = "arm64-v8a",
+    values = {"cpu": "arm64-v8a"},
+)
+
+config_setting(
+    name = "armeabi-v7a",
+    values = {"cpu": "armeabi-v7a"},
+)
+
+config_setting(
+    name = "x86",
+    values = {"cpu": "x86"},
+)
+
+config_setting(
+    name = "x86_64",
+    values = {"cpu": "x86_64"},
+)

MODULE.bazel

@@ -19,6 +19,10 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1")
 bazel_dep(name = "rules_pkg", version = "1.0.1")
 bazel_dep(name = "aspect_rules_ts", version = "2.4.2")
 
+# C++
+bazel_dep(name = "rules_foreign_cc", version = "0.10.1")
+bazel_dep(name = "googletest", version = "1.14.0")
+
 ####### Node.js version #########
 bazel_dep(name = "rules_nodejs", version = "6.2.0")
 
@@ -78,9 +82,10 @@ rules_ts_ext.deps()
 use_repo(rules_ts_ext, "npm_typescript")
 
 # Kotlin
-bazel_dep(
-    name = "rules_kotlin",
-    version = "1.9.1",
+bazel_dep(name = "rules_kotlin", version = "1.9.1")
+single_version_override(
+    module_name = "rules_kotlin",
+    patches = ["//patches:rules_kotlin.context_receivers.patch"],
 )
 
 # TODO: Custom compiler version breaks embedded jdeps generator plugin - enable when removing custom kotlinc (see .bazelrc jvm_emit_jdeps)
@@ -120,8 +125,7 @@ use_repo(remote_android_extensions, "android_gmaven_r8")
 bazel_dep(name = "rules_jvm_external")
 git_override(
     module_name = "rules_jvm_external",
-    # bazel-6 branch
-    commit = "44f4355b2dbe0d6fd73d690ad66bf5744d482a29",
+    commit = "73b63ba801f14d1bde7807994cc8c15db226ceec",
     remote = "https://github.com/sugarmanz/rules_jvm_external.git",
 )
 
@@ -179,6 +183,11 @@ maven.install(
         "com.github.AlexTrotsenko:j2v8-debugger:0.2.3",
         "com.facebook.stetho:stetho:1.5.1",
 
+        # Hermes
+        "com.facebook.fbjni:fbjni-java-only:0.6.0",
+        "com.facebook.fbjni:fbjni:0.6.0",
+        "com.facebook.soloader:soloader:0.11.0",
+
         # Test utils
         "org.junit.jupiter:junit-jupiter-api:5.6.0",
 

WORKSPACE.bzlmod

@@ -1,13 +1,13 @@
-load("//:build_constants.bzl", "build_constants")
 load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_file")
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive", "http_file")
 load("@bazel_tools//tools/build_defs/repo:maven_rules.bzl", "maven_aar")
+load("//:build_constants.bzl", "build_constants")
 
 build_constants()
 
 android_sdk_repository(
     name = "androidsdk",
-    api_level = 33
+    api_level = 33,
 )
 
 maven_aar(
@@ -23,11 +23,52 @@ bind(
 http_file(
     name = "android_test_orchestrator_apk",
     sha256 = "b7a2e7d0184b03e12c7357f3914d539da40b52a11e90815edff1022c655f459b",
-    url = "https://dl.google.com/android/maven2/androidx/test/orchestrator/1.4.2/orchestrator-1.4.2.apk"
+    url = "https://dl.google.com/android/maven2/androidx/test/orchestrator/1.4.2/orchestrator-1.4.2.apk",
 )
 
 http_file(
     name = "android_test_services_apk",
     sha256 = "c6bc74268b29bdabad8da962e00e2f6fd613c24b42c69e81b258397b4819f156",
-    url = "https://dl.google.com/android/maven2/androidx/test/services/test-services/1.4.2/test-services-1.4.2.apk"
-)
+    url = "https://dl.google.com/android/maven2/androidx/test/services/test-services/1.4.2/test-services-1.4.2.apk",
+)
+
+# Hermes
+git_repository(
+    name = "hermes",
+    build_file = "//third_party/hermes:BUILD",
+    commit = "c16bd411cdb20d424f843ea8623c00fa3d493a6c",
+    patches = ["//patches:hermes.loosen_host_function_params.patch"],
+    remote = "https://github.com/facebook/hermes",
+)
+
+git_repository(
+    name = "fbjni",
+    build_file = "//third_party/fbjni:BUILD",
+    commit = "1cf763714e99d45c23dfb316d702ebfa8290af64",
+    patches = ["//patches:fbjni.install_headers.patch"],
+    remote = "https://github.com/facebookincubator/fbjni",
+)
+
+RN_VERSION = "0.74.1"
+
+# Pull prefab Android Hermes built against React Native JSI
+http_archive(
+    name = "rn_hermes_android",
+    build_file = "//third_party/rn:hermes_android.BUILD",
+    url = "https://repo1.maven.org/maven2/com/facebook/react/hermes-android/{}/hermes-android-{}-release.aar".format(RN_VERSION, RN_VERSION),
+)
+
+# Access to React Native JSI override
+git_repository(
+    name = "react_native",
+    build_file = "//third_party/rn:react_native.BUILD",
+    patches = ["//patches:react_native.loosen_host_function_params.patch"],
+    remote = "https://github.com/facebook/react-native",
+    tag = "v{}".format(RN_VERSION),
+)
+
+http_archive(
+    name = "fbjni_artifact",
+    build_file = "//third_party/fbjni:artifact.BUILD",
+    url = "https://repo1.maven.org/maven2/com/facebook/fbjni/fbjni/0.6.0/fbjni-0.6.0.aar",
+)

android/demo/BUILD

@@ -1,8 +1,8 @@
 load("@rules_android//android:rules.bzl", "android_binary", "android_library")
-load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_import")
 load("@rules_kotlin//kotlin:android.bzl", "kt_android_library")
-load(":deps.bzl", "main_deps", "test_deps")
+load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_import")
 load("@rules_player//kotlin:defs.bzl", "lint")
+load(":deps.bzl", "main_deps", "test_deps")
 
 kt_android_library(
     name = "demo_lib",
@@ -15,15 +15,14 @@ kt_android_library(
 
 android_binary(
     name = "demo",
-    custom_package = "com.intuit.playerui.android.reference.demo",
     assets = glob(["src/main/assets/mocks/**"]),
     assets_dir = "src/main/assets",
-    dex_shards = 3,
+    custom_package = "com.intuit.playerui.android.reference.demo",
+    dex_shards = 4,
     manifest = ":src/main/AndroidManifest.xml",
     multidex = "native",
     deps = [
         ":demo_lib",
-        "@maven//:org_jetbrains_kotlin_kotlin_reflect",
     ],
 )
 

android/demo/deps.bzl

@@ -2,17 +2,18 @@ maven_main = [
     "@maven//:androidx_navigation_navigation_runtime",
     "@maven//:androidx_navigation_navigation_ui_ktx",
     "@maven//:androidx_navigation_navigation_fragment_ktx",
-
     "@maven//:com_afollestad_material_dialogs_core",
     "@maven//:com_google_android_material_material",
     #"@maven//:com_squareup_leakcanary_leakcanary_android",
-    "@android_j2v8//aar",
-    "@maven//:com_facebook_stetho_stetho"
+    # For when hermes-android _isn't_ included
+    "@maven//:com_facebook_soloader_soloader",
+    # For when j2v8-android _is_ included (not sure why transitive dep isn't included)
+    "@maven//:com_github_AlexTrotsenko_j2v8_debugger",
 ]
 
 maven_test = [
     "@maven//:androidx_test_espresso_espresso_intents",
-    "@maven//:androidx_test_ext_junit_ktx"
+    "@maven//:androidx_test_ext_junit_ktx",
 ]
 
 main_deps = maven_main + [
@@ -24,5 +25,5 @@ main_deps = maven_main + [
 ]
 
 test_deps = maven_test + [
-    "//jvm/utils"
+    "//jvm/utils",
 ]

android/demo/src/androidTest/java/com/intuit/playerui/android/reference/demo/test/SplashActivityTest.kt

@@ -7,6 +7,7 @@ import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.rules.activityScenarioRule
+import com.facebook.soloader.SoLoader
 import com.intuit.playerui.android.reference.demo.test.base.waitForViewInRoot
 import com.intuit.playerui.android.reference.demo.ui.splash.SplashActivity
 import com.intuit.playerui.utils.makeFlow
@@ -33,6 +34,7 @@ class SplashActivityTest {
     }
 
     private val intent by lazy {
+        SoLoader.init(ApplicationProvider.getApplicationContext(), false)
         Intent(ApplicationProvider.getApplicationContext(), SplashActivity::class.java).apply {
             action = "ACTION_VIEW"
             data = Uri.parse("player://domain.com/demo?json=$json")