[svg] Post-relocation cleanup
Remove transitional headers and build file workarounds.
Change-Id: Iebe63d44b6ae3a736c7b31a45975056ec92b91cd
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/327716
Commit-Queue: Florin Malita <fmalita@google.com>
Reviewed-by: Tyler Denniston <tdenniston@google.com>
diff --git a/experimental/svg/model/SkSVGAttribute.h b/experimental/svg/model/SkSVGAttribute.h
deleted file mode 100644
index 48a3de8..0000000
--- a/experimental/svg/model/SkSVGAttribute.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright 2020 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-// Transitional forwarding header. To be removed.
-#include "modules/svg/include/SkSVGAttribute.h"
-
diff --git a/experimental/svg/model/SkSVGAttributeParser.h b/experimental/svg/model/SkSVGAttributeParser.h
deleted file mode 100644
index 6e15d26..0000000
--- a/experimental/svg/model/SkSVGAttributeParser.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright 2020 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-// Transitional forwarding header. To be removed.
-#include "modules/svg/include/SkSVGAttributeParser.h"
-
diff --git a/experimental/svg/model/SkSVGCircle.h b/experimental/svg/model/SkSVGCircle.h
deleted file mode 100644
index 6ec529d..0000000
--- a/experimental/svg/model/SkSVGCircle.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright 2020 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-// Transitional forwarding header. To be removed.
-#include "modules/svg/include/SkSVGCircle.h"
-
diff --git a/experimental/svg/model/SkSVGClipPath.h b/experimental/svg/model/SkSVGClipPath.h
deleted file mode 100644
index c5b00d3..0000000
--- a/experimental/svg/model/SkSVGClipPath.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright 2020 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-// Transitional forwarding header. To be removed.
-#include "modules/svg/include/SkSVGClipPath.h"
-
diff --git a/experimental/svg/model/SkSVGContainer.h b/experimental/svg/model/SkSVGContainer.h
deleted file mode 100644
index 7efb7e1..0000000
--- a/experimental/svg/model/SkSVGContainer.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright 2020 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-// Transitional forwarding header. To be removed.
-#include "modules/svg/include/SkSVGContainer.h"
-
diff --git a/experimental/svg/model/SkSVGDOM.h b/experimental/svg/model/SkSVGDOM.h
deleted file mode 100644
index f63d85d..0000000
--- a/experimental/svg/model/SkSVGDOM.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright 2020 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-// Transitional forwarding header. To be removed.
-#include "modules/svg/include/SkSVGDOM.h"
-
diff --git a/experimental/svg/model/SkSVGDefs.h b/experimental/svg/model/SkSVGDefs.h
deleted file mode 100644
index 70f4c3b..0000000
--- a/experimental/svg/model/SkSVGDefs.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright 2020 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-// Transitional forwarding header. To be removed.
-#include "modules/svg/include/SkSVGDefs.h"
-
diff --git a/experimental/svg/model/SkSVGEllipse.h b/experimental/svg/model/SkSVGEllipse.h
deleted file mode 100644
index 8531ba7..0000000
--- a/experimental/svg/model/SkSVGEllipse.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright 2020 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-// Transitional forwarding header. To be removed.
-#include "modules/svg/include/SkSVGEllipse.h"
-
diff --git a/experimental/svg/model/SkSVGG.h b/experimental/svg/model/SkSVGG.h
deleted file mode 100644
index ee91471..0000000
--- a/experimental/svg/model/SkSVGG.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright 2020 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-// Transitional forwarding header. To be removed.
-#include "modules/svg/include/SkSVGG.h"
-
diff --git a/experimental/svg/model/SkSVGGradient.h b/experimental/svg/model/SkSVGGradient.h
deleted file mode 100644
index b7708bf..0000000
--- a/experimental/svg/model/SkSVGGradient.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright 2020 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-// Transitional forwarding header. To be removed.
-#include "modules/svg/include/SkSVGGradient.h"
-
diff --git a/experimental/svg/model/SkSVGHiddenContainer.h b/experimental/svg/model/SkSVGHiddenContainer.h
deleted file mode 100644
index ad7c464..0000000
--- a/experimental/svg/model/SkSVGHiddenContainer.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright 2020 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-// Transitional forwarding header. To be removed.
-#include "modules/svg/include/SkSVGHiddenContainer.h"
-
diff --git a/experimental/svg/model/SkSVGIDMapper.h b/experimental/svg/model/SkSVGIDMapper.h
deleted file mode 100644
index 244c350..0000000
--- a/experimental/svg/model/SkSVGIDMapper.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright 2020 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-// Transitional forwarding header. To be removed.
-#include "modules/svg/include/SkSVGIDMapper.h"
-
diff --git a/experimental/svg/model/SkSVGLine.h b/experimental/svg/model/SkSVGLine.h
deleted file mode 100644
index 1008a68..0000000
--- a/experimental/svg/model/SkSVGLine.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright 2020 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-// Transitional forwarding header. To be removed.
-#include "modules/svg/include/SkSVGLine.h"
-
diff --git a/experimental/svg/model/SkSVGLinearGradient.h b/experimental/svg/model/SkSVGLinearGradient.h
deleted file mode 100644
index ce6e844..0000000
--- a/experimental/svg/model/SkSVGLinearGradient.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright 2020 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-// Transitional forwarding header. To be removed.
-#include "modules/svg/include/SkSVGLinearGradient.h"
-
diff --git a/experimental/svg/model/SkSVGNode.h b/experimental/svg/model/SkSVGNode.h
deleted file mode 100644
index d3c01e6..0000000
--- a/experimental/svg/model/SkSVGNode.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright 2020 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-// Transitional forwarding header. To be removed.
-#include "modules/svg/include/SkSVGNode.h"
-
diff --git a/experimental/svg/model/SkSVGPath.h b/experimental/svg/model/SkSVGPath.h
deleted file mode 100644
index 38f9a5e..0000000
--- a/experimental/svg/model/SkSVGPath.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright 2020 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-// Transitional forwarding header. To be removed.
-#include "modules/svg/include/SkSVGPath.h"
-
diff --git a/experimental/svg/model/SkSVGPattern.h b/experimental/svg/model/SkSVGPattern.h
deleted file mode 100644
index 75a677b..0000000
--- a/experimental/svg/model/SkSVGPattern.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright 2020 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-// Transitional forwarding header. To be removed.
-#include "modules/svg/include/SkSVGPattern.h"
-
diff --git a/experimental/svg/model/SkSVGPoly.h b/experimental/svg/model/SkSVGPoly.h
deleted file mode 100644
index b65f9fd..0000000
--- a/experimental/svg/model/SkSVGPoly.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright 2020 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-// Transitional forwarding header. To be removed.
-#include "modules/svg/include/SkSVGPoly.h"
-
diff --git a/experimental/svg/model/SkSVGRadialGradient.h b/experimental/svg/model/SkSVGRadialGradient.h
deleted file mode 100644
index 49648b3..0000000
--- a/experimental/svg/model/SkSVGRadialGradient.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright 2020 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-// Transitional forwarding header. To be removed.
-#include "modules/svg/include/SkSVGRadialGradient.h"
-
diff --git a/experimental/svg/model/SkSVGRect.h b/experimental/svg/model/SkSVGRect.h
deleted file mode 100644
index 89cf038..0000000
--- a/experimental/svg/model/SkSVGRect.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright 2020 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-// Transitional forwarding header. To be removed.
-#include "modules/svg/include/SkSVGRect.h"
-
diff --git a/experimental/svg/model/SkSVGRenderContext.h b/experimental/svg/model/SkSVGRenderContext.h
deleted file mode 100644
index 35c6788e..0000000
--- a/experimental/svg/model/SkSVGRenderContext.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright 2020 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-// Transitional forwarding header. To be removed.
-#include "modules/svg/include/SkSVGRenderContext.h"
-
diff --git a/experimental/svg/model/SkSVGSVG.h b/experimental/svg/model/SkSVGSVG.h
deleted file mode 100644
index e5d20f0..0000000
--- a/experimental/svg/model/SkSVGSVG.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright 2020 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-// Transitional forwarding header. To be removed.
-#include "modules/svg/include/SkSVGSVG.h"
-
diff --git a/experimental/svg/model/SkSVGShape.h b/experimental/svg/model/SkSVGShape.h
deleted file mode 100644
index 537e9cd..0000000
--- a/experimental/svg/model/SkSVGShape.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright 2020 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-// Transitional forwarding header. To be removed.
-#include "modules/svg/include/SkSVGShape.h"
-
diff --git a/experimental/svg/model/SkSVGStop.h b/experimental/svg/model/SkSVGStop.h
deleted file mode 100644
index e114609..0000000
--- a/experimental/svg/model/SkSVGStop.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright 2020 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-// Transitional forwarding header. To be removed.
-#include "modules/svg/include/SkSVGStop.h"
-
diff --git a/experimental/svg/model/SkSVGText.h b/experimental/svg/model/SkSVGText.h
deleted file mode 100644
index ca866ff..0000000
--- a/experimental/svg/model/SkSVGText.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright 2020 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-// Transitional forwarding header. To be removed.
-#include "modules/svg/include/SkSVGText.h"
-
diff --git a/experimental/svg/model/SkSVGTransformableNode.h b/experimental/svg/model/SkSVGTransformableNode.h
deleted file mode 100644
index 7c8a790..0000000
--- a/experimental/svg/model/SkSVGTransformableNode.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright 2020 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-// Transitional forwarding header. To be removed.
-#include "modules/svg/include/SkSVGTransformableNode.h"
-
diff --git a/experimental/svg/model/SkSVGTypes.h b/experimental/svg/model/SkSVGTypes.h
deleted file mode 100644
index 888de9b..0000000
--- a/experimental/svg/model/SkSVGTypes.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright 2020 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-// Transitional forwarding header. To be removed.
-#include "modules/svg/include/SkSVGTypes.h"
-
diff --git a/experimental/svg/model/SkSVGUse.h b/experimental/svg/model/SkSVGUse.h
deleted file mode 100644
index f392f83..0000000
--- a/experimental/svg/model/SkSVGUse.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright 2020 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-// Transitional forwarding header. To be removed.
-#include "modules/svg/include/SkSVGUse.h"
-
diff --git a/experimental/svg/model/SkSVGValue.h b/experimental/svg/model/SkSVGValue.h
deleted file mode 100644
index 9d52852..0000000
--- a/experimental/svg/model/SkSVGValue.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright 2020 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-// Transitional forwarding header. To be removed.
-#include "modules/svg/include/SkSVGValue.h"
-
diff --git a/public.bzl b/public.bzl
index 19cf9fe..2cc0719 100644
--- a/public.bzl
+++ b/public.bzl
@@ -988,11 +988,7 @@
################################################################################
def svg_lib_hdrs():
- return native.glob([
- # transitional headers, to be removed
- "experimental/svg/model/*.h",
- "modules/svg/include/*.h",
- ])
+ return native.glob(["modules/svg/include/*.h"])
def svg_lib_srcs():
return native.glob(["modules/svg/src/*.cpp"])
diff --git a/tools/rewrite_includes.py b/tools/rewrite_includes.py
index 5ae8ddb..6ebd460 100755
--- a/tools/rewrite_includes.py
+++ b/tools/rewrite_includes.py
@@ -39,8 +39,7 @@
# Don't count our local Vulkan headers as Skia headers;
# we don't want #include <vulkan/vulkan_foo.h> rewritten to point to them.
# Nor do we care about things in node_modules, used by *Kits.
-# Also ignore transitional SVG headers.
-ignorelist = ['include/third_party/vulkan', 'node_modules', 'experimental/svg/model']
+ignorelist = ['include/third_party/vulkan', 'node_modules']
assert '/' in [os.sep, os.altsep]
def fix_path(p):
