summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortfarina <tfarina@chromium.org>2015-01-07 17:17:33 -0800
committerCommit bot <commit-bot@chromium.org>2015-01-08 01:18:30 +0000
commit786967e07357b26548fc1c21f131c331053ef6d5 (patch)
tree66169a886bbc26e509661fef26f86f081efccf58
parent4bb4328938b0bfa4d2fa59403ce3de5639952e16 (diff)
downloadchromium_src-786967e07357b26548fc1c21f131c331053ef6d5.zip
chromium_src-786967e07357b26548fc1c21f131c331053ef6d5.tar.gz
chromium_src-786967e07357b26548fc1c21f131c331053ef6d5.tar.bz2
skia: Do not include a source file in another source file.
That can can a duplication of definition of symbols. This was exposed by https://chromium.googlesource.com/chromium/src/+/c87c3d2d949f9ba4f17627dc023b303c75b7635f in the Mac GN builder with errors like: duplicate symbol __ZN3gfx27SkMatrixToCGAffineTransformERK8SkMatrix in: obj/skia/ext/skia_unittests.skia_utils_mac_unittest.o obj/skia/ext/skia.skia_utils_mac.o (and more similar issues). Entries were found with the following command line: $ g grep include skia/ext | grep mm\" BUG=444058 TEST=unit_tests R=thakis@chromium.org Review URL: https://codereview.chromium.org/832053004 Cr-Commit-Position: refs/heads/master@{#310427}
-rw-r--r--skia/ext/skia_utils_ios_unittest.mm4
-rw-r--r--skia/ext/skia_utils_mac_unittest.mm5
2 files changed, 7 insertions, 2 deletions
diff --git a/skia/ext/skia_utils_ios_unittest.mm b/skia/ext/skia_utils_ios_unittest.mm
index c26e688..8d0c9be 100644
--- a/skia/ext/skia_utils_ios_unittest.mm
+++ b/skia/ext/skia_utils_ios_unittest.mm
@@ -2,10 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "skia/ext/skia_utils_ios.h"
+
+#import <ImageIO/ImageIO.h>
#import <UIKit/UIKit.h>
#include "base/base64.h"
-#include "skia/ext/skia_utils_ios.mm"
#include "testing/gtest/include/gtest/gtest.h"
namespace {
diff --git a/skia/ext/skia_utils_mac_unittest.mm b/skia/ext/skia_utils_mac_unittest.mm
index a8f1b70..27c862bf 100644
--- a/skia/ext/skia_utils_mac_unittest.mm
+++ b/skia/ext/skia_utils_mac_unittest.mm
@@ -2,10 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "skia/ext/skia_utils_mac.mm"
+#include "skia/ext/skia_utils_mac.h"
+
+#import <AppKit/AppKit.h>
#include "base/mac/scoped_nsobject.h"
#include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/skia/include/core/SkCanvas.h"
namespace {