ohos: Use custom domain when logging with hilog

This modifies the existing patch to redirect log messages to
hilog to use a non-zero domain, which allows us to filter
logs via the domain on ohos devices.
We set 0xE0C3 for Rust code in servo, using a different number
allows us to seperate spidermonkey from servo logs if wanted.

Signed-off-by: Jonathan Schwender <[email protected]>

Author: jschwe

mozjs-sys/Cargo.toml

@@ -2,7 +2,7 @@
 name = "mozjs_sys"
 description = "System crate for the Mozilla SpiderMonkey JavaScript engine."
 repository.workspace = true
-version = "0.128.9-2"
+version = "0.128.9-3"
 authors = ["Mozilla"]
 links = "mozjs"
 build = "build.rs"

mozjs-sys/etc/patches/0036-Redirect_errors_to_hilog_on_OpenHarmony.patch

@@ -10,6 +10,19 @@ index e0e14bf60..179de2592 100644
 
 
  @depends(target)
+@@ -1019,6 +1019,12 @@
+
+ set_config("ANDROID_CPU_ARCH", android_cpu_arch)
+
++@depends(target, when=target_is_ohos)
++def ohos_hilog_domain(target):
++    return "0xE0C4"
++
++set_define("OHOS_LOG_DOMAIN", ohos_hilog_domain)
++
+
+ @depends("--enable-project", build_environment, "--help")
+ @imports(_from="os.path", _import="exists")
 diff --git a/config/system-headers.mozbuild b/config/system-headers.mozbuild
 index 471599f17..a89f0ca7a 100644
 --- a/config/system-headers.mozbuild
@@ -47,7 +60,7 @@ index 3cfc92533..9c487ac45 100644
 +#ifdef ANDROID
 +  __android_log_print(ANDROID_LOG_ERROR, "Gecko", "mozalloc_abort: %s", msg);
 +#elif defined(OHOS)
-+    (void) OH_LOG_Print(LOG_APP, LOG_ERROR, 0, "Gecko",
++    (void) OH_LOG_Print(LOG_APP, LOG_ERROR, OHOS_LOG_DOMAIN, "Gecko",
 +         "mozalloc_abort: %{public}s\n", msg);
 +#else
    fputs(msg, stderr);
@@ -75,7 +88,7 @@ index 0b7395177..e84d76aba 100644
                              /* aMaxFrames */ 0);
  #  endif
 +#elif defined(OHOS)
-+    (void) OH_LOG_Print(LOG_APP, LOG_FATAL, 0, "MOZ_Assert",
++    (void) OH_LOG_Print(LOG_APP, LOG_FATAL, OHOS_LOG_DOMAIN, "MOZ_Assert",
 +     "Assertion failure: %{public}s, at %{public}s:%{public}d\n",
 +     aStr, aFilename, aLine);
  #else
@@ -86,7 +99,7 @@ index 0b7395177..e84d76aba 100644
                        "[%d] Hit MOZ_CRASH(%s) at %s:%d\n", MOZ_GET_PID(), aStr,
                        aFilename, aLine);
 +#elif defined(OHOS)
-+  (void) OH_LOG_Print(LOG_APP, LOG_FATAL, 0, "MOZ_CRASH",
++  (void) OH_LOG_Print(LOG_APP, LOG_FATAL, OHOS_LOG_DOMAIN, "MOZ_CRASH",
 +   "Hit MOZ_CRASH(%{public}s), at %{public}s:%{public}d\n",
 +   aStr, aFilename, aLine);
  #else
@@ -116,7 +129,7 @@ index 3247b993c..c7039d5f8 100644
 +#if defined(ANDROID)
    __android_log_print(ANDROID_LOG_INFO, "Gecko", "%s", s.str().c_str());
 +#elif defined(OHOS)
-+    (void) OH_LOG_Print(LOG_APP, LOG_INFO, 0, "Gecko", "%{public}s\n", s.str().c_str());
++    (void) OH_LOG_Print(LOG_APP, LOG_INFO, OHOS_LOG_DOMAIN, "Gecko", "%{public}s\n", s.str().c_str());
  #else
    fputs(s.str().c_str(), stderr);
  #endif
@@ -143,7 +156,7 @@ index c3a2ca89e..3fea33f4b 100644
  }
 +#elif defined(OHOS)
 +MFBT_API void vprintf_stderr(const char* aFmt, va_list aArgs) {
-+   (void) OH_LOG_Print(LOG_APP, LOG_INFO, 0, "Gecko", aFmt, aArgs);
++   (void) OH_LOG_Print(LOG_APP, LOG_INFO, OHOS_LOG_DOMAIN, "Gecko", aFmt, aArgs);
 +}
  #elif defined(FUZZING_SNAPSHOT)
  MFBT_API void vprintf_stderr(const char* aFmt, va_list aArgs) {
@@ -194,7 +207,7 @@ index 52bd6abc5..781402d56 100644
 +    if (fd == _pr_stderr) {                                  \
 +        char savebyte = buf[nb];                             \
 +        buf[nb] = '\0';                                      \
-+        (void) OH_LOG_Print(LOG_APP, LOG_INFO, 0, "PRLog",   \
++        (void) OH_LOG_Print(LOG_APP, LOG_INFO, OHOS_LOG_DOMAIN, "PRLog",   \
 +               "%{public}s\n", buf);             \
 +        buf[nb] = savebyte;                                  \
 +    } else {                                                 \
@@ -209,7 +222,7 @@ index 52bd6abc5..781402d56 100644
  #ifdef ANDROID
      __android_log_write(ANDROID_LOG_ERROR, "PRLog", "Aborting");
 +#elif defined(OHOS)
-+    (void) OH_LOG_Print(LOG_APP, LOG_ERROR, 0, "PRLog", "Aborting\n");
++    (void) OH_LOG_Print(LOG_APP, LOG_ERROR, OHOS_LOG_DOMAIN, "PRLog", "Aborting\n");
  #endif
      abort();
  }
@@ -218,7 +231,7 @@ index 52bd6abc5..781402d56 100644
      __android_log_assert(NULL, "PRLog", "Assertion failure: %s, at %s:%d\n",
                           s, file, ln);
 +#elif defined(OHOS)
-+    (void) OH_LOG_Print(LOG_APP, LOG_ERROR, 0, "PRLog",
++    (void) OH_LOG_Print(LOG_APP, LOG_ERROR, OHOS_LOG_DOMAIN, "PRLog",
 +                        "Assertion failure: %{public}s, at %{public}s:%{public}d\n",s, file, ln);
  #endif
      abort();