Rename textual includes as *.inc.
This makes it easier to distinguish source files that can stand on their own vs files meant to be #included into other source files.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2184143002
Review-Url: https://codereview.chromium.org/2184143002
diff --git a/gyp/animator.gyp b/gyp/animator.gyp
index 982dcd6..c0cc943 100644
--- a/gyp/animator.gyp
+++ b/gyp/animator.gyp
@@ -49,8 +49,8 @@
'../src/animator/SkBoundable.cpp',
'../src/animator/SkBoundable.h',
'../src/animator/SkBuildCondensedInfo.cpp',
- #'../src/animator/SkCondensedDebug.cpp', fails on windows
- #'../src/animator/SkCondensedRelease.cpp',
+ #'../src/animator/SkCondensedDebug.inc', fails on windows
+ #'../src/animator/SkCondensedRelease.inc',
'../src/animator/SkDisplayable.cpp',
'../src/animator/SkDisplayable.h',
'../src/animator/SkDisplayAdd.cpp',
diff --git a/public.bzl b/public.bzl
index 569308d..a725c0e 100644
--- a/public.bzl
+++ b/public.bzl
@@ -57,7 +57,7 @@
PRIVATE_HDRS_LIST = [
"include/private/**/*",
- "src/utils/SkWhitelistChecksums.cpp",
+ "src/utils/SkWhitelistChecksums.inc",
]
PRIVATE_HDRS = struct(
diff --git a/src/animator/SkBuildCondensedInfo.cpp b/src/animator/SkBuildCondensedInfo.cpp
index 1ee1917..84a591f 100644
--- a/src/animator/SkBuildCondensedInfo.cpp
+++ b/src/animator/SkBuildCondensedInfo.cpp
@@ -142,11 +142,11 @@
} while (gUnknowns.count() > 0);
qsort(gInfosTypeIDs.begin(), gInfosTypeIDs.count(), sizeof(gInfosTypeIDs[0]), &type_compare);
#ifdef SK_DEBUG
- FILE* condensed = fopen("../../src/animator/SkCondensedDebug.cpp", "w+");
+ FILE* condensed = fopen("../../src/animator/SkCondensedDebug.inc", "w+");
fprintf(condensed, "#include \"SkTypes.h\"\n");
fprintf(condensed, "#ifdef SK_DEBUG\n");
#else
- FILE* condensed = fopen("../../src/animator/SkCondensedRelease.cpp", "w+");
+ FILE* condensed = fopen("../../src/animator/SkCondensedRelease.inc", "w+");
fprintf(condensed, "#include \"SkTypes.h\"\n");
fprintf(condensed, "#ifdef SK_RELEASE\n");
#endif
diff --git a/src/animator/SkCondensedDebug.cpp b/src/animator/SkCondensedDebug.inc
similarity index 100%
rename from src/animator/SkCondensedDebug.cpp
rename to src/animator/SkCondensedDebug.inc
diff --git a/src/animator/SkCondensedRelease.cpp b/src/animator/SkCondensedRelease.inc
similarity index 100%
rename from src/animator/SkCondensedRelease.cpp
rename to src/animator/SkCondensedRelease.inc
diff --git a/src/animator/SkGetCondensedInfo.cpp b/src/animator/SkGetCondensedInfo.cpp
index de6fa18..4c65325 100644
--- a/src/animator/SkGetCondensedInfo.cpp
+++ b/src/animator/SkGetCondensedInfo.cpp
@@ -11,12 +11,12 @@
#if SK_USE_CONDENSED_INFO == 1
-// SkCondensed.cpp is auto-generated
+// SkCondensed.inc is auto-generated
// To generate it, execute SkDisplayType::BuildCondensedInfo()
#ifdef SK_DEBUG
-#include "SkCondensedDebug.cpp"
+#include "SkCondensedDebug.inc"
#else
-#include "SkCondensedRelease.cpp"
+#include "SkCondensedRelease.inc"
#endif
static int _searchByName(const unsigned char* lengths, int count, const char* strings, const char target[]) {
diff --git a/src/utils/SkWhitelistChecksums.cpp b/src/utils/SkWhitelistChecksums.inc
similarity index 97%
rename from src/utils/SkWhitelistChecksums.cpp
rename to src/utils/SkWhitelistChecksums.inc
index 5fba207..4b17df4 100644
--- a/src/utils/SkWhitelistChecksums.cpp
+++ b/src/utils/SkWhitelistChecksums.inc
@@ -4,7 +4,7 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*
- * GenerateChecksums() in ../../src/utils/SkWhitelistTypefaces.cpp generated SkWhitelistChecksums.cpp.
+ * GenerateChecksums() in ../../src/utils/SkWhitelistTypefaces.cpp generated SkWhitelistChecksums.inc.
* Run 'whitelist_typefaces --generate' to create anew.
*/
diff --git a/src/utils/SkWhitelistTypefaces.cpp b/src/utils/SkWhitelistTypefaces.cpp
index 2912fe2..ac82f7c 100644
--- a/src/utils/SkWhitelistTypefaces.cpp
+++ b/src/utils/SkWhitelistTypefaces.cpp
@@ -13,7 +13,7 @@
#include "SkUtils.h"
#include "../sfnt/SkOTUtils.h"
-#include "SkWhitelistChecksums.cpp"
+#include "SkWhitelistChecksums.inc"
#define WHITELIST_DEBUG 0
@@ -216,7 +216,7 @@
return true;
}
-const char checksumFileName[] = "SkWhitelistChecksums.cpp";
+const char checksumFileName[] = "SkWhitelistChecksums.inc";
const char checksumHeader[] =
"/*" "\n"
diff --git a/tools/sk_tool_utils_font.cpp b/tools/sk_tool_utils_font.cpp
index 8f701c2..8a7ab46 100644
--- a/tools/sk_tool_utils_font.cpp
+++ b/tools/sk_tool_utils_font.cpp
@@ -15,10 +15,10 @@
namespace sk_tool_utils {
-#include "test_font_monospace.cpp"
-#include "test_font_sans_serif.cpp"
-#include "test_font_serif.cpp"
-#include "test_font_index.cpp"
+#include "test_font_monospace.inc"
+#include "test_font_sans_serif.inc"
+#include "test_font_serif.inc"
+#include "test_font_index.inc"
void release_portable_typefaces() {
for (int index = 0; index < gTestFontsCount; ++index) {
diff --git a/tools/test_font_index.cpp b/tools/test_font_index.inc
similarity index 100%
rename from tools/test_font_index.cpp
rename to tools/test_font_index.inc
diff --git a/tools/test_font_monospace.cpp b/tools/test_font_monospace.inc
similarity index 100%
rename from tools/test_font_monospace.cpp
rename to tools/test_font_monospace.inc
diff --git a/tools/test_font_sans_serif.cpp b/tools/test_font_sans_serif.inc
similarity index 100%
rename from tools/test_font_sans_serif.cpp
rename to tools/test_font_sans_serif.inc
diff --git a/tools/test_font_serif.cpp b/tools/test_font_serif.inc
similarity index 100%
rename from tools/test_font_serif.cpp
rename to tools/test_font_serif.inc