GN rework

common/graphics/BUILD.gn

@@ -25,6 +25,7 @@ source_set("graphics") {
     "//flutter/display_list",
     "//flutter/fml",
     "//flutter/shell/version:version",
+    "//flutter/shell/common:base64",
     "//third_party/boringssl",
     "//third_party/rapidjson",
     "//third_party/skia",

common/graphics/persistent_cache.cc

@@ -19,10 +19,10 @@
 #include "flutter/fml/paths.h"
 #include "flutter/fml/trace_event.h"
 #include "flutter/shell/version/version.h"
+#include "flutter/shell/common/base64.h"
 #include "openssl/sha.h"
 #include "rapidjson/document.h"
 #include "third_party/skia/include/gpu/GrDirectContext.h"
-#include "third_party/skia/include/utils/SkBase64.h"
 
 namespace flutter {
 
@@ -169,21 +169,21 @@ sk_sp<SkData> ParseBase32(const std::string& input) {
 }
 
 sk_sp<SkData> ParseBase64(const std::string& input) {
-  SkBase64::Error error;
+  Base64::Error error;
 
   size_t output_len;
-  error = SkBase64::Decode(input.c_str(), input.length(), nullptr, &output_len);
-  if (error != SkBase64::Error::kNoError) {
-    FML_LOG(ERROR) << "Base64 decode error: " << error;
+  error = Base64::Decode(input.c_str(), input.length(), nullptr, &output_len);
+  if (error != Base64::Error::kNone) {
+    FML_LOG(ERROR) << "Base64 decode error: " << (int)error;
     FML_LOG(ERROR) << "Base64 can't decode: " << input;
     return nullptr;
   }
 
   sk_sp<SkData> data = SkData::MakeUninitialized(output_len);
   void* output = data->writable_data();
-  error = SkBase64::Decode(input.c_str(), input.length(), output, &output_len);
-  if (error != SkBase64::Error::kNoError) {
-    FML_LOG(ERROR) << "Base64 decode error: " << error;
+  error = Base64::Decode(input.c_str(), input.length(), output, &output_len);
+  if (error != Base64::Error::kNone) {
+    FML_LOG(ERROR) << "Base64 decode error: " << (int)error;
     FML_LOG(ERROR) << "Base64 can't decode: " << input;
     return nullptr;
   }

shell/common/BUILD.gn

@@ -81,8 +81,6 @@ source_set("common") {
   sources = [
     "animator.cc",
     "animator.h",
-    "base64.cc",
-    "base64.h",
     "context_options.cc",
     "context_options.h",
     "display_manager.cc",
@@ -146,6 +144,7 @@ source_set("common") {
     "//flutter/lib/ui",
     "//flutter/runtime",
     "//flutter/shell/profiling",
+    "//flutter/shell/common:base64",
     "//third_party/dart/runtime:dart_api",
     "//third_party/skia",
   ]
@@ -160,6 +159,14 @@ source_set("common") {
   }
 }
 
+# These are in their own source_set to avoid a dependency cycle with //common/graphics
+source_set("base64") {
+    sources = [
+      "base64.cc",
+      "base64.h",
+    ]
+}
+
 template("shell_host_executable") {
   executable(target_name) {
     testonly = true
@@ -315,6 +322,7 @@ if (enable_unittests) {
       ":shell_unittests_fixtures",
       "//flutter/assets",
       "//flutter/common/graphics",
+      "//flutter/shell/common:base64",
       "//flutter/shell/profiling:profiling_unittests",
       "//flutter/shell/version",
       "//flutter/testing:fixture_test",

shell/common/base64.cc

@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shell/common/base64.h"
+#include "flutter/shell/common/base64.h"
 
-#include "fml/logging.h"
+#include "flutter/fml/logging.h"
 
 #include <cstdint>
 
@@ -158,4 +158,4 @@ size_t Base64::Encode(const void* srcv, size_t length, void* dstv) {
     return (length + 2) / 3 * 4;
 }
 
-}  // namespace flutter
+}  // namespace flutter