aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2020-01-28 03:13:58 -0500
committerGitHub <noreply@github.com>2020-01-28 03:13:58 -0500
commit4e56b8606b156efbcbcdf62bb9827518eab453f5 (patch)
tree42c5bd13157c1b64bd37b6f876fec88d31306033
parent1b7223a284cd8f780d2856a50747ffc97beffd23 (diff)
parent3adf62dd7b1032ea7906de646063a97e9fe7397d (diff)
downloadservo-4e56b8606b156efbcbcdf62bb9827518eab453f5.tar.gz
servo-4e56b8606b156efbcbcdf62bb9827518eab453f5.zip
Auto merge of #25626 - servo:jdm-patch-35, r=Manishearth
Add profilemozjs feature to embedding This makes it possible to obtain better profiling output from the JS engine when building for an embedder like the HoloLens.
-rw-r--r--ports/libsimpleservo/api/Cargo.toml1
-rw-r--r--ports/libsimpleservo/capi/Cargo.toml1
2 files changed, 2 insertions, 0 deletions
diff --git a/ports/libsimpleservo/api/Cargo.toml b/ports/libsimpleservo/api/Cargo.toml
index f78ca00a741..0dd05e38561 100644
--- a/ports/libsimpleservo/api/Cargo.toml
+++ b/ports/libsimpleservo/api/Cargo.toml
@@ -48,6 +48,7 @@ native-bluetooth = ["libservo/native-bluetooth"]
no_static_freetype = ["libservo/no_static_freetype"]
no-wgl = ["libservo/no-wgl"]
oculusvr = ["libservo/oculusvr"]
+profilemozjs = ["libservo/profilemozjs"]
refcell_backtrace = ["libservo/refcell_backtrace"]
webdriver = ["libservo/webdriver"]
uwp = ["libservo/uwp", "webxr/openxr-api"]
diff --git a/ports/libsimpleservo/capi/Cargo.toml b/ports/libsimpleservo/capi/Cargo.toml
index 7c93998ed0f..2c629587c8f 100644
--- a/ports/libsimpleservo/capi/Cargo.toml
+++ b/ports/libsimpleservo/capi/Cargo.toml
@@ -43,6 +43,7 @@ max_log_level = ["simpleservo/max_log_level"]
native-bluetooth = ["simpleservo/native-bluetooth"]
no-wgl = ["simpleservo/no-wgl"]
oculusvr = ["simpleservo/oculusvr"]
+profilemozjs = ["simpleservo/profilemozjs"]
refcell_backtrace = ["simpleservo/refcell_backtrace"]
uwp = ["simpleservo/uwp"]
webdriver = ["simpleservo/webdriver"]