Hermes support Android 15 (#509)

* fbjni + libc++

* hermes + jsi

* hermes_jni

* remove extra opts, only need linkopts

* move libjsi to hermes location

jvm/hermes/BUILD

@@ -36,11 +36,11 @@ merge_jni_into_android_library(
     name = "hermes-android",
     android_library = ":hermes-android-lib",
     cc_libs = [
-        "@fbjni_artifact//:libc++_shared",
-        "@fbjni_artifact//:libfbjni",
-        "//jvm/hermes/libs:libjsi",
+        "//jvm/hermes/libs:libc++_shared",
+        "//jvm/hermes/libs:libfbjni",
+        "//third_party/rn:libjsi",
         "//jvm/hermes/src/main/jni:hermes_jni_lib",
-        "@rn_hermes_android//:libhermes",
+        "//third_party/rn:libhermes",
     ],
     cc_name = "hermes_jni",
     tags = ["maven_coordinates=%s:%s:aar:%s" % (DEFAULT_GROUP, "hermes-android", VERSION)],

jvm/hermes/libs/BUILD

@@ -3,14 +3,25 @@ cc_import(
     system_provided = True,
 )
 
-# This is the only one we aren't pulling from AARs or building from source (for RN)
 alias(
-    name = "libjsi",
+    name = "libfbjni",
     actual = select({
-        "//:arm64-v8a": "//jvm/hermes/libs/arm64-v8a:libjsi",
-        "//:armeabi-v7a": "//jvm/hermes/libs/armeabi-v7a:libjsi",
-        "//:x86": "//jvm/hermes/libs/x86:libjsi",
-        "//:x86_64": "//jvm/hermes/libs/x86_64:libjsi",
+        "//:arm64-v8a": "//jvm/hermes/libs/arm64-v8a:libfbjni",
+        "//:armeabi-v7a": "//jvm/hermes/libs/armeabi-v7a:libfbjni",
+        "//:x86": "//jvm/hermes/libs/x86:libfbjni",
+        "//:x86_64": "//jvm/hermes/libs/x86_64:libfbjni",
+        "//conditions:default": "empty",
+    }),
+    visibility = ["//visibility:public"],
+)
+
+alias(
+    name = "libc++_shared",
+    actual = select({
+        "//:arm64-v8a": "//jvm/hermes/libs/arm64-v8a:libc++_shared",
+        "//:armeabi-v7a": "//jvm/hermes/libs/armeabi-v7a:libc++_shared",
+        "//:x86": "//jvm/hermes/libs/x86:libc++_shared",
+        "//:x86_64": "//jvm/hermes/libs/x86_64:libc++_shared",
         "//conditions:default": "empty",
     }),
     visibility = ["//visibility:public"],

jvm/hermes/libs/arm64-v8a/BUILD

@@ -1,5 +1,11 @@
 cc_import(
-    name = "libjsi",
-    shared_library = ":libjsi.so",
+    name = "libfbjni",
+    shared_library = ":libfbjni.so",
     visibility = ["//visibility:public"],
 )
+
+cc_import(
+    name = "libc++_shared",
+    shared_library = ":libc++_shared.so",
+    visibility = ["//visibility:public"],
+)

jvm/hermes/libs/armeabi-v7a/BUILD

@@ -1,5 +1,11 @@
 cc_import(
-    name = "libjsi",
-    shared_library = ":libjsi.so",
+    name = "libfbjni",
+    shared_library = ":libfbjni.so",
     visibility = ["//visibility:public"],
 )
+
+cc_import(
+    name = "libc++_shared",
+    shared_library = ":libc++_shared.so",
+    visibility = ["//visibility:public"],
+)

jvm/hermes/libs/x86/BUILD

@@ -1,5 +1,11 @@
 cc_import(
-    name = "libjsi",
-    shared_library = ":libjsi.so",
+    name = "libfbjni",
+    shared_library = ":libfbjni.so",
     visibility = ["//visibility:public"],
 )
+
+cc_import(
+    name = "libc++_shared",
+    shared_library = ":libc++_shared.so",
+    visibility = ["//visibility:public"],
+)

jvm/hermes/libs/x86_64/BUILD

@@ -1,5 +1,11 @@
 cc_import(
-    name = "libjsi",
-    shared_library = ":libjsi.so",
+    name = "libfbjni",
+    shared_library = ":libfbjni.so",
     visibility = ["//visibility:public"],
 )
+
+cc_import(
+    name = "libc++_shared",
+    shared_library = ":libc++_shared.so",
+    visibility = ["//visibility:public"],
+)

jvm/hermes/src/main/jni/BUILD

@@ -30,9 +30,12 @@ cc_library(
     ],
     copts = CMAKE_BUILD_TYPE_COPTS + select({
         # TODO: Using React Natives JSI doesn't contain microtask - come back to this if we build it ourselves
-        ":should_include_jni": ["-DJSI_MICROTASK"],
+        ":should_include_jni": [
+            "-DJSI_MICROTASK"
+        ],
         "//conditions:default": [],
     }),
+    linkopts = ["-Wl,-z,max-page-size=16384"],
     visibility = ["//visibility:public"],
     deps = select({
         # Host build

third_party/fbjni/artifact.BUILD

@@ -44,7 +44,7 @@ cc_import(
 )
 
 alias(
-    name = "libfbjni",
+    name = "libfbjni_pulled",
     actual = select({
         "@player//:arm64-v8a": ":arm64-v8a_libfbjni",
         "@player//:armeabi-v7a": ":armeabi-v7a_libfbjni",
@@ -56,7 +56,7 @@ alias(
 )
 
 alias(
-    name = "libc++_shared",
+    name = "libc++_shared_pulled",
     actual = select({
         "@player//:arm64-v8a": ":arm64-v8a_libc++_shared",
         "@player//:armeabi-v7a": ":armeabi-v7a_libc++_shared",

third_party/rn/BUILD

@@ -2,3 +2,27 @@ exports_files([
     "react_native.BUILD",
     "hermes_android.BUILD",
 ])
+
+alias(
+    name = "libhermes",
+    actual = select({
+        "//:arm64-v8a": "//third_party/rn/arm64-v8a:libhermes",
+        "//:armeabi-v7a": "//third_party/rn/armeabi-v7a:libhermes",
+        "//:x86": "//third_party/rn/x86:libhermes",
+        "//:x86_64": "//third_party/rn/x86_64:libhermes",
+        "//conditions:default": "empty",
+    }),
+    visibility = ["//visibility:public"],
+)
+
+alias(
+    name = "libjsi",
+    actual = select({
+        "//:arm64-v8a": "//third_party/rn/arm64-v8a:libjsi",
+        "//:armeabi-v7a": "//third_party/rn/armeabi-v7a:libjsi",
+        "//:x86": "//third_party/rn/x86:libjsi",
+        "//:x86_64": "//third_party/rn/x86_64:libjsi",
+        "//conditions:default": "empty",
+    }),
+    visibility = ["//visibility:public"],
+)

third_party/rn/arm64-v8a/BUILD

@@ -0,0 +1,11 @@
+cc_import(
+    name = "libhermes",
+    shared_library = ":libhermes.so",
+    visibility = ["//visibility:public"],
+)
+
+cc_import(
+    name = "libjsi",
+    shared_library = ":libjsi.so",
+    visibility = ["//visibility:public"],
+)

third_party/rn/armeabi-v7a/BUILD

@@ -0,0 +1,11 @@
+cc_import(
+    name = "libhermes",
+    shared_library = ":libhermes.so",
+    visibility = ["//visibility:public"],
+)
+
+cc_import(
+    name = "libjsi",
+    shared_library = ":libjsi.so",
+    visibility = ["//visibility:public"],
+)

third_party/rn/hermes_android.BUILD

@@ -24,7 +24,7 @@ cc_import(
 )
 
 alias(
-    name = "libhermes",
+    name = "libhermes_pulled",
     actual = select({
         "@player//:arm64-v8a": ":arm64-v8a_libhermes",
         "@player//:armeabi-v7a": ":armeabi-v7a_libhermes",

third_party/rn/x86/BUILD

@@ -0,0 +1,11 @@
+cc_import(
+    name = "libhermes",
+    shared_library = ":libhermes.so",
+    visibility = ["//visibility:public"],
+)
+
+cc_import(
+    name = "libjsi",
+    shared_library = ":libjsi.so",
+    visibility = ["//visibility:public"],
+)

third_party/rn/x86_64/BUILD

@@ -0,0 +1,11 @@
+cc_import(
+    name = "libhermes",
+    shared_library = ":libhermes.so",
+    visibility = ["//visibility:public"],
+)
+
+cc_import(
+    name = "libjsi",
+    shared_library = ":libjsi.so",
+    visibility = ["//visibility:public"],
+)