merge in klp-release history after reset to klp-dev
diff --git a/src/preprocessor.target.darwin-arm.mk b/src/preprocessor.target.darwin-arm.mk
index d2c3213..31c9ec7 100644
--- a/src/preprocessor.target.darwin-arm.mk
+++ b/src/preprocessor.target.darwin-arm.mk
@@ -85,6 +85,8 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
+	'-DLOGGING_IS_OFFICIAL_BUILD=1' \
+	'-DTRACING_IS_OFFICIAL_BUILD=1' \
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
@@ -169,6 +171,8 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
+	'-DLOGGING_IS_OFFICIAL_BUILD=1' \
+	'-DTRACING_IS_OFFICIAL_BUILD=1' \
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
diff --git a/src/preprocessor.target.darwin-mips.mk b/src/preprocessor.target.darwin-mips.mk
index 481aed2..3fc0011 100644
--- a/src/preprocessor.target.darwin-mips.mk
+++ b/src/preprocessor.target.darwin-mips.mk
@@ -85,6 +85,8 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
+	'-DLOGGING_IS_OFFICIAL_BUILD=1' \
+	'-DTRACING_IS_OFFICIAL_BUILD=1' \
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
@@ -169,6 +171,8 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
+	'-DLOGGING_IS_OFFICIAL_BUILD=1' \
+	'-DTRACING_IS_OFFICIAL_BUILD=1' \
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
diff --git a/src/preprocessor.target.darwin-x86.mk b/src/preprocessor.target.darwin-x86.mk
index 6f33714..50f920b 100644
--- a/src/preprocessor.target.darwin-x86.mk
+++ b/src/preprocessor.target.darwin-x86.mk
@@ -87,6 +87,8 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
+	'-DLOGGING_IS_OFFICIAL_BUILD=1' \
+	'-DTRACING_IS_OFFICIAL_BUILD=1' \
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
@@ -174,6 +176,8 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
+	'-DLOGGING_IS_OFFICIAL_BUILD=1' \
+	'-DTRACING_IS_OFFICIAL_BUILD=1' \
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
diff --git a/src/preprocessor.target.linux-arm.mk b/src/preprocessor.target.linux-arm.mk
index d2c3213..31c9ec7 100644
--- a/src/preprocessor.target.linux-arm.mk
+++ b/src/preprocessor.target.linux-arm.mk
@@ -85,6 +85,8 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
+	'-DLOGGING_IS_OFFICIAL_BUILD=1' \
+	'-DTRACING_IS_OFFICIAL_BUILD=1' \
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
@@ -169,6 +171,8 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
+	'-DLOGGING_IS_OFFICIAL_BUILD=1' \
+	'-DTRACING_IS_OFFICIAL_BUILD=1' \
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
diff --git a/src/preprocessor.target.linux-mips.mk b/src/preprocessor.target.linux-mips.mk
index 481aed2..3fc0011 100644
--- a/src/preprocessor.target.linux-mips.mk
+++ b/src/preprocessor.target.linux-mips.mk
@@ -85,6 +85,8 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
+	'-DLOGGING_IS_OFFICIAL_BUILD=1' \
+	'-DTRACING_IS_OFFICIAL_BUILD=1' \
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
@@ -169,6 +171,8 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
+	'-DLOGGING_IS_OFFICIAL_BUILD=1' \
+	'-DTRACING_IS_OFFICIAL_BUILD=1' \
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
diff --git a/src/preprocessor.target.linux-x86.mk b/src/preprocessor.target.linux-x86.mk
index 6f33714..50f920b 100644
--- a/src/preprocessor.target.linux-x86.mk
+++ b/src/preprocessor.target.linux-x86.mk
@@ -87,6 +87,8 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
+	'-DLOGGING_IS_OFFICIAL_BUILD=1' \
+	'-DTRACING_IS_OFFICIAL_BUILD=1' \
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
@@ -174,6 +176,8 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
+	'-DLOGGING_IS_OFFICIAL_BUILD=1' \
+	'-DTRACING_IS_OFFICIAL_BUILD=1' \
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
diff --git a/src/translator_common.target.darwin-arm.mk b/src/translator_common.target.darwin-arm.mk
index 53d40dd..a040133 100644
--- a/src/translator_common.target.darwin-arm.mk
+++ b/src/translator_common.target.darwin-arm.mk
@@ -110,6 +110,8 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
+	'-DLOGGING_IS_OFFICIAL_BUILD=1' \
+	'-DTRACING_IS_OFFICIAL_BUILD=1' \
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
@@ -197,6 +199,8 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
+	'-DLOGGING_IS_OFFICIAL_BUILD=1' \
+	'-DTRACING_IS_OFFICIAL_BUILD=1' \
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
diff --git a/src/translator_common.target.darwin-mips.mk b/src/translator_common.target.darwin-mips.mk
index dcc65cb..ad1ed22 100644
--- a/src/translator_common.target.darwin-mips.mk
+++ b/src/translator_common.target.darwin-mips.mk
@@ -110,6 +110,8 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
+	'-DLOGGING_IS_OFFICIAL_BUILD=1' \
+	'-DTRACING_IS_OFFICIAL_BUILD=1' \
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
@@ -197,6 +199,8 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
+	'-DLOGGING_IS_OFFICIAL_BUILD=1' \
+	'-DTRACING_IS_OFFICIAL_BUILD=1' \
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
diff --git a/src/translator_common.target.darwin-x86.mk b/src/translator_common.target.darwin-x86.mk
index a2211af..23fddb0 100644
--- a/src/translator_common.target.darwin-x86.mk
+++ b/src/translator_common.target.darwin-x86.mk
@@ -112,6 +112,8 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
+	'-DLOGGING_IS_OFFICIAL_BUILD=1' \
+	'-DTRACING_IS_OFFICIAL_BUILD=1' \
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
@@ -202,6 +204,8 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
+	'-DLOGGING_IS_OFFICIAL_BUILD=1' \
+	'-DTRACING_IS_OFFICIAL_BUILD=1' \
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
diff --git a/src/translator_common.target.linux-arm.mk b/src/translator_common.target.linux-arm.mk
index 53d40dd..a040133 100644
--- a/src/translator_common.target.linux-arm.mk
+++ b/src/translator_common.target.linux-arm.mk
@@ -110,6 +110,8 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
+	'-DLOGGING_IS_OFFICIAL_BUILD=1' \
+	'-DTRACING_IS_OFFICIAL_BUILD=1' \
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
@@ -197,6 +199,8 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
+	'-DLOGGING_IS_OFFICIAL_BUILD=1' \
+	'-DTRACING_IS_OFFICIAL_BUILD=1' \
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
diff --git a/src/translator_common.target.linux-mips.mk b/src/translator_common.target.linux-mips.mk
index dcc65cb..ad1ed22 100644
--- a/src/translator_common.target.linux-mips.mk
+++ b/src/translator_common.target.linux-mips.mk
@@ -110,6 +110,8 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
+	'-DLOGGING_IS_OFFICIAL_BUILD=1' \
+	'-DTRACING_IS_OFFICIAL_BUILD=1' \
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
@@ -197,6 +199,8 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
+	'-DLOGGING_IS_OFFICIAL_BUILD=1' \
+	'-DTRACING_IS_OFFICIAL_BUILD=1' \
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
diff --git a/src/translator_common.target.linux-x86.mk b/src/translator_common.target.linux-x86.mk
index a2211af..23fddb0 100644
--- a/src/translator_common.target.linux-x86.mk
+++ b/src/translator_common.target.linux-x86.mk
@@ -112,6 +112,8 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
+	'-DLOGGING_IS_OFFICIAL_BUILD=1' \
+	'-DTRACING_IS_OFFICIAL_BUILD=1' \
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
@@ -202,6 +204,8 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
+	'-DLOGGING_IS_OFFICIAL_BUILD=1' \
+	'-DTRACING_IS_OFFICIAL_BUILD=1' \
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
diff --git a/src/translator_glsl.target.darwin-arm.mk b/src/translator_glsl.target.darwin-arm.mk
index 100d4e6..7c1cf91 100644
--- a/src/translator_glsl.target.darwin-arm.mk
+++ b/src/translator_glsl.target.darwin-arm.mk
@@ -82,6 +82,8 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
+	'-DLOGGING_IS_OFFICIAL_BUILD=1' \
+	'-DTRACING_IS_OFFICIAL_BUILD=1' \
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
@@ -169,6 +171,8 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
+	'-DLOGGING_IS_OFFICIAL_BUILD=1' \
+	'-DTRACING_IS_OFFICIAL_BUILD=1' \
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
diff --git a/src/translator_glsl.target.darwin-mips.mk b/src/translator_glsl.target.darwin-mips.mk
index 72881e0..b0e8e61 100644
--- a/src/translator_glsl.target.darwin-mips.mk
+++ b/src/translator_glsl.target.darwin-mips.mk
@@ -82,6 +82,8 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
+	'-DLOGGING_IS_OFFICIAL_BUILD=1' \
+	'-DTRACING_IS_OFFICIAL_BUILD=1' \
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
@@ -169,6 +171,8 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
+	'-DLOGGING_IS_OFFICIAL_BUILD=1' \
+	'-DTRACING_IS_OFFICIAL_BUILD=1' \
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
diff --git a/src/translator_glsl.target.darwin-x86.mk b/src/translator_glsl.target.darwin-x86.mk
index 912a166..84defe2 100644
--- a/src/translator_glsl.target.darwin-x86.mk
+++ b/src/translator_glsl.target.darwin-x86.mk
@@ -84,6 +84,8 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
+	'-DLOGGING_IS_OFFICIAL_BUILD=1' \
+	'-DTRACING_IS_OFFICIAL_BUILD=1' \
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
@@ -174,6 +176,8 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
+	'-DLOGGING_IS_OFFICIAL_BUILD=1' \
+	'-DTRACING_IS_OFFICIAL_BUILD=1' \
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
diff --git a/src/translator_glsl.target.linux-arm.mk b/src/translator_glsl.target.linux-arm.mk
index 100d4e6..7c1cf91 100644
--- a/src/translator_glsl.target.linux-arm.mk
+++ b/src/translator_glsl.target.linux-arm.mk
@@ -82,6 +82,8 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
+	'-DLOGGING_IS_OFFICIAL_BUILD=1' \
+	'-DTRACING_IS_OFFICIAL_BUILD=1' \
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
@@ -169,6 +171,8 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
+	'-DLOGGING_IS_OFFICIAL_BUILD=1' \
+	'-DTRACING_IS_OFFICIAL_BUILD=1' \
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
diff --git a/src/translator_glsl.target.linux-mips.mk b/src/translator_glsl.target.linux-mips.mk
index 72881e0..b0e8e61 100644
--- a/src/translator_glsl.target.linux-mips.mk
+++ b/src/translator_glsl.target.linux-mips.mk
@@ -82,6 +82,8 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
+	'-DLOGGING_IS_OFFICIAL_BUILD=1' \
+	'-DTRACING_IS_OFFICIAL_BUILD=1' \
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
@@ -169,6 +171,8 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
+	'-DLOGGING_IS_OFFICIAL_BUILD=1' \
+	'-DTRACING_IS_OFFICIAL_BUILD=1' \
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
diff --git a/src/translator_glsl.target.linux-x86.mk b/src/translator_glsl.target.linux-x86.mk
index 912a166..84defe2 100644
--- a/src/translator_glsl.target.linux-x86.mk
+++ b/src/translator_glsl.target.linux-x86.mk
@@ -84,6 +84,8 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
+	'-DLOGGING_IS_OFFICIAL_BUILD=1' \
+	'-DTRACING_IS_OFFICIAL_BUILD=1' \
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
@@ -174,6 +176,8 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
+	'-DLOGGING_IS_OFFICIAL_BUILD=1' \
+	'-DTRACING_IS_OFFICIAL_BUILD=1' \
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \