Import chromium-68.0.3440.106

services/data_decoder/public/cpp/BUILD.gn

@@ -0,0 +1,56 @@
+# Copyright 2016 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//mojo/public/tools/bindings/mojom.gni")
+
+source_set("cpp") {
+  sources = [
+    "decode_image.cc",
+    "decode_image.h",
+    "json_sanitizer.cc",
+    "json_sanitizer.h",
+    "safe_json_parser.cc",
+    "safe_json_parser.h",
+    "safe_json_parser_impl.cc",
+    "safe_json_parser_impl.h",
+    "safe_json_parser_impl.h",
+    "safe_xml_parser.cc",
+    "safe_xml_parser.h",
+  ]
+
+  public_deps = [
+    "//services/data_decoder/public/mojom",
+    "//services/service_manager/public/cpp",
+  ]
+
+  if (is_android) {
+    sources -= [ "json_sanitizer.cc" ]
+    sources += [
+      "json_sanitizer_android.cc",
+      "safe_json_parser_android.cc",
+      "safe_json_parser_android.h",
+    ]
+    deps = [
+      "android:safe_json_jni_headers",
+      "//base",
+    ]
+  }
+}
+
+static_library("test_support") {
+  testonly = true
+  sources = [
+    "test_data_decoder_service.cc",
+    "test_data_decoder_service.h",
+    "testing_json_parser.cc",
+    "testing_json_parser.h",
+  ]
+
+  deps = [
+    ":cpp",
+    "//base",
+    "//services/data_decoder:lib",
+    "//services/service_manager/public/cpp/test:test_support",
+  ]
+}

services/data_decoder/public/cpp/android/BUILD.gn

@@ -0,0 +1,22 @@
+# Copyright 2015 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build/config/android/rules.gni")
+
+_jni_sources =
+    [ "java/src/org/chromium/services/data_decoder/JsonSanitizer.java" ]
+
+generate_jni("safe_json_jni_headers") {
+  sources = _jni_sources
+  jni_package = "data_decoder"
+}
+
+if (current_toolchain == default_toolchain) {
+  android_library("safe_json_java") {
+    deps = [
+      "//base:base_java",
+    ]
+    java_files = [] + _jni_sources
+  }
+}