From 5a4690bf26932c0d6940e4af8516d920e09ae81a Mon Sep 17 00:00:00 2001 From: Chris Craik Date: Tue, 14 Jul 2015 12:13:03 -0700 Subject: [PATCH] Clean up unncessary defines LOG_TAG and TRACE_TAG are already defined in the makefile Change-Id: I9e53e3dacbe018441edd74cb7c8c90846defee74 --- libs/hwui/AmbientShadow.cpp | 2 -- libs/hwui/AssetAtlas.cpp | 2 -- libs/hwui/Caches.cpp | 2 -- libs/hwui/Caches.h | 5 ----- libs/hwui/DeferredDisplayList.cpp | 3 --- libs/hwui/DisplayList.cpp | 2 -- libs/hwui/DisplayList.h | 4 ---- libs/hwui/Extensions.cpp | 2 -- libs/hwui/FboCache.cpp | 2 -- libs/hwui/GradientCache.cpp | 2 -- libs/hwui/Image.cpp | 2 -- libs/hwui/Layer.cpp | 2 -- libs/hwui/LayerCache.cpp | 2 -- libs/hwui/Matrix.cpp | 2 -- libs/hwui/Patch.cpp | 2 -- libs/hwui/PatchCache.cpp | 2 -- libs/hwui/PathCache.cpp | 3 --- libs/hwui/PathTessellator.cpp | 3 --- libs/hwui/PixelBuffer.cpp | 2 -- libs/hwui/Program.cpp | 3 --- libs/hwui/ProgramCache.cpp | 2 -- libs/hwui/RenderBufferCache.cpp | 2 -- libs/hwui/RenderNode.cpp | 3 --- libs/hwui/RenderNode.h | 4 ---- libs/hwui/RenderProperties.cpp | 2 -- libs/hwui/ResourceCache.cpp | 2 -- libs/hwui/ShadowTessellator.cpp | 3 --- libs/hwui/SkiaShader.cpp | 2 -- libs/hwui/Snapshot.cpp | 2 -- libs/hwui/SpotShadow.cpp | 2 -- libs/hwui/TextDropShadowCache.cpp | 2 -- libs/hwui/Texture.cpp | 2 -- libs/hwui/TextureCache.cpp | 3 --- libs/hwui/font/Font.cpp | 3 --- libs/hwui/renderstate/Stencil.h | 4 ---- libs/hwui/renderthread/DrawFrameTask.cpp | 2 -- libs/hwui/utils/Blur.cpp | 2 -- 37 files changed, 91 deletions(-) diff --git a/libs/hwui/AmbientShadow.cpp b/libs/hwui/AmbientShadow.cpp index a4100a2d44fbe..f8debcb288349 100644 --- a/libs/hwui/AmbientShadow.cpp +++ b/libs/hwui/AmbientShadow.cpp @@ -14,8 +14,6 @@ * limitations under the License. */ -#define LOG_TAG "OpenGLRenderer" - /** * Extra vertices for the corner for smoother corner. * Only for outer vertices. diff --git a/libs/hwui/AssetAtlas.cpp b/libs/hwui/AssetAtlas.cpp index 2889d2ff0b780..7e09699168254 100644 --- a/libs/hwui/AssetAtlas.cpp +++ b/libs/hwui/AssetAtlas.cpp @@ -14,8 +14,6 @@ * limitations under the License. */ -#define LOG_TAG "OpenGLRenderer" - #include "AssetAtlas.h" #include "Caches.h" #include "Image.h" diff --git a/libs/hwui/Caches.cpp b/libs/hwui/Caches.cpp index 10304517fff73..312df1cecce3b 100644 --- a/libs/hwui/Caches.cpp +++ b/libs/hwui/Caches.cpp @@ -14,8 +14,6 @@ * limitations under the License. */ -#define LOG_TAG "OpenGLRenderer" - #include "Caches.h" #include "GammaFontRenderer.h" diff --git a/libs/hwui/Caches.h b/libs/hwui/Caches.h index 804f609e9a0fe..c617a4d868a20 100644 --- a/libs/hwui/Caches.h +++ b/libs/hwui/Caches.h @@ -17,11 +17,6 @@ #ifndef ANDROID_HWUI_CACHES_H #define ANDROID_HWUI_CACHES_H -#ifndef LOG_TAG - #define LOG_TAG "OpenGLRenderer" -#endif - - #include "AssetAtlas.h" #include "Dither.h" #include "Extensions.h" diff --git a/libs/hwui/DeferredDisplayList.cpp b/libs/hwui/DeferredDisplayList.cpp index f05857c43a350..e56d2bec7ff28 100644 --- a/libs/hwui/DeferredDisplayList.cpp +++ b/libs/hwui/DeferredDisplayList.cpp @@ -14,9 +14,6 @@ * limitations under the License. */ -#define LOG_TAG "OpenGLRenderer" -#define ATRACE_TAG ATRACE_TAG_VIEW - #include #include diff --git a/libs/hwui/DisplayList.cpp b/libs/hwui/DisplayList.cpp index e679bff18c86b..eacfac7d93a05 100644 --- a/libs/hwui/DisplayList.cpp +++ b/libs/hwui/DisplayList.cpp @@ -14,8 +14,6 @@ * limitations under the License. */ -#define ATRACE_TAG ATRACE_TAG_VIEW - #include #include diff --git a/libs/hwui/DisplayList.h b/libs/hwui/DisplayList.h index 7fbda1f6b1925..d7615484c9753 100644 --- a/libs/hwui/DisplayList.h +++ b/libs/hwui/DisplayList.h @@ -17,10 +17,6 @@ #ifndef ANDROID_HWUI_DISPLAY_LIST_H #define ANDROID_HWUI_DISPLAY_LIST_H -#ifndef LOG_TAG - #define LOG_TAG "OpenGLRenderer" -#endif - #include #include diff --git a/libs/hwui/Extensions.cpp b/libs/hwui/Extensions.cpp index 2a82216eb145d..b6feea5bb9b00 100644 --- a/libs/hwui/Extensions.cpp +++ b/libs/hwui/Extensions.cpp @@ -14,8 +14,6 @@ * limitations under the License. */ -#define LOG_TAG "OpenGLRenderer" - #include "Extensions.h" #include "Debug.h" diff --git a/libs/hwui/FboCache.cpp b/libs/hwui/FboCache.cpp index b54d53233a65d..cca3cb7a98f1f 100644 --- a/libs/hwui/FboCache.cpp +++ b/libs/hwui/FboCache.cpp @@ -14,8 +14,6 @@ * limitations under the License. */ -#define LOG_TAG "OpenGLRenderer" - #include #include "Debug.h" diff --git a/libs/hwui/GradientCache.cpp b/libs/hwui/GradientCache.cpp index ea93e7f9716b5..aa105f9fec0a9 100644 --- a/libs/hwui/GradientCache.cpp +++ b/libs/hwui/GradientCache.cpp @@ -14,8 +14,6 @@ * limitations under the License. */ -#define LOG_TAG "OpenGLRenderer" - #include #include "Caches.h" diff --git a/libs/hwui/Image.cpp b/libs/hwui/Image.cpp index a31c54675f8a0..68a356ba1be02 100644 --- a/libs/hwui/Image.cpp +++ b/libs/hwui/Image.cpp @@ -14,8 +14,6 @@ * limitations under the License. */ -#define LOG_TAG "OpenGLRenderer" - #include #include "Caches.h" diff --git a/libs/hwui/Layer.cpp b/libs/hwui/Layer.cpp index e16865ede1600..928f91bdd4d99 100644 --- a/libs/hwui/Layer.cpp +++ b/libs/hwui/Layer.cpp @@ -14,8 +14,6 @@ * limitations under the License. */ -#define LOG_TAG "OpenGLRenderer" - #include "Layer.h" #include "Caches.h" diff --git a/libs/hwui/LayerCache.cpp b/libs/hwui/LayerCache.cpp index bcbd4129b7e70..ade2ac7a83642 100644 --- a/libs/hwui/LayerCache.cpp +++ b/libs/hwui/LayerCache.cpp @@ -14,8 +14,6 @@ * limitations under the License. */ -#define LOG_TAG "OpenGLRenderer" - #include #include diff --git a/libs/hwui/Matrix.cpp b/libs/hwui/Matrix.cpp index 06e67c0e85ad5..115e23c848dce 100644 --- a/libs/hwui/Matrix.cpp +++ b/libs/hwui/Matrix.cpp @@ -14,8 +14,6 @@ * limitations under the License. */ -#define LOG_TAG "OpenGLRenderer" - #include #include #include diff --git a/libs/hwui/Patch.cpp b/libs/hwui/Patch.cpp index 6a7dfb3890d31..15d2ae94aeaaa 100644 --- a/libs/hwui/Patch.cpp +++ b/libs/hwui/Patch.cpp @@ -14,8 +14,6 @@ * limitations under the License. */ -#define LOG_TAG "OpenGLRenderer" - #include #include diff --git a/libs/hwui/PatchCache.cpp b/libs/hwui/PatchCache.cpp index 27652624b4981..98812805259e2 100644 --- a/libs/hwui/PatchCache.cpp +++ b/libs/hwui/PatchCache.cpp @@ -14,8 +14,6 @@ * limitations under the License. */ -#define LOG_TAG "OpenGLRenderer" - #include #include diff --git a/libs/hwui/PathCache.cpp b/libs/hwui/PathCache.cpp index 3af640f76365d..e36f5f17d29c0 100644 --- a/libs/hwui/PathCache.cpp +++ b/libs/hwui/PathCache.cpp @@ -14,9 +14,6 @@ * limitations under the License. */ -#define LOG_TAG "OpenGLRenderer" -#define ATRACE_TAG ATRACE_TAG_VIEW - #include #include #include diff --git a/libs/hwui/PathTessellator.cpp b/libs/hwui/PathTessellator.cpp index 38f214ab3e5d2..5294be887c934 100644 --- a/libs/hwui/PathTessellator.cpp +++ b/libs/hwui/PathTessellator.cpp @@ -13,10 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -#define LOG_TAG "OpenGLRenderer" #define LOG_NDEBUG 1 -#define ATRACE_TAG ATRACE_TAG_VIEW #define VERTEX_DEBUG 0 diff --git a/libs/hwui/PixelBuffer.cpp b/libs/hwui/PixelBuffer.cpp index 9665a68b0e773..96247260f0f42 100644 --- a/libs/hwui/PixelBuffer.cpp +++ b/libs/hwui/PixelBuffer.cpp @@ -14,8 +14,6 @@ * limitations under the License. */ -#define LOG_TAG "OpenGLRenderer" - #include "PixelBuffer.h" #include "Debug.h" diff --git a/libs/hwui/Program.cpp b/libs/hwui/Program.cpp index 32713e9b36f39..e43b80d440e76 100644 --- a/libs/hwui/Program.cpp +++ b/libs/hwui/Program.cpp @@ -14,9 +14,6 @@ * limitations under the License. */ -#define LOG_TAG "OpenGLRenderer" -#define ATRACE_TAG ATRACE_TAG_VIEW - #include #include "Program.h" diff --git a/libs/hwui/ProgramCache.cpp b/libs/hwui/ProgramCache.cpp index 41adda15f3677..7f16deb418135 100644 --- a/libs/hwui/ProgramCache.cpp +++ b/libs/hwui/ProgramCache.cpp @@ -14,8 +14,6 @@ * limitations under the License. */ -#define LOG_TAG "OpenGLRenderer" - #include #include "Caches.h" diff --git a/libs/hwui/RenderBufferCache.cpp b/libs/hwui/RenderBufferCache.cpp index d0812c96afd74..39e0dbf4f1e12 100644 --- a/libs/hwui/RenderBufferCache.cpp +++ b/libs/hwui/RenderBufferCache.cpp @@ -14,8 +14,6 @@ * limitations under the License. */ -#define LOG_TAG "OpenGLRenderer" - #include #include "Debug.h" diff --git a/libs/hwui/RenderNode.cpp b/libs/hwui/RenderNode.cpp index 2facce411ec7c..6ad52ad9eac02 100644 --- a/libs/hwui/RenderNode.cpp +++ b/libs/hwui/RenderNode.cpp @@ -14,9 +14,6 @@ * limitations under the License. */ -#define ATRACE_TAG ATRACE_TAG_VIEW -#define LOG_TAG "OpenGLRenderer" - #include "RenderNode.h" #include diff --git a/libs/hwui/RenderNode.h b/libs/hwui/RenderNode.h index 025a4a416e4c5..4063d4bd53cee 100644 --- a/libs/hwui/RenderNode.h +++ b/libs/hwui/RenderNode.h @@ -16,10 +16,6 @@ #ifndef RENDERNODE_H #define RENDERNODE_H -#ifndef LOG_TAG - #define LOG_TAG "OpenGLRenderer" -#endif - #include #include diff --git a/libs/hwui/RenderProperties.cpp b/libs/hwui/RenderProperties.cpp index 4f6ef4ef9e3d1..a9ae9b5322be5 100644 --- a/libs/hwui/RenderProperties.cpp +++ b/libs/hwui/RenderProperties.cpp @@ -14,8 +14,6 @@ * limitations under the License. */ -#define LOG_TAG "OpenGLRenderer" - #include "RenderProperties.h" #include diff --git a/libs/hwui/ResourceCache.cpp b/libs/hwui/ResourceCache.cpp index 75d81346d62ae..b26e433cfa4c4 100644 --- a/libs/hwui/ResourceCache.cpp +++ b/libs/hwui/ResourceCache.cpp @@ -14,8 +14,6 @@ * limitations under the License. */ -#define LOG_TAG "OpenGLRenderer" - #include "ResourceCache.h" #include "Caches.h" diff --git a/libs/hwui/ShadowTessellator.cpp b/libs/hwui/ShadowTessellator.cpp index 09d125839a68b..b6271f63a6068 100644 --- a/libs/hwui/ShadowTessellator.cpp +++ b/libs/hwui/ShadowTessellator.cpp @@ -14,9 +14,6 @@ * limitations under the License. */ -#define LOG_TAG "OpenGLRenderer" -#define ATRACE_TAG ATRACE_TAG_VIEW - #include #include #include diff --git a/libs/hwui/SkiaShader.cpp b/libs/hwui/SkiaShader.cpp index 2cfb9e1dc8c19..5faef75016b30 100644 --- a/libs/hwui/SkiaShader.cpp +++ b/libs/hwui/SkiaShader.cpp @@ -14,8 +14,6 @@ * limitations under the License. */ -#define LOG_TAG "OpenGLRenderer" - #include "SkiaShader.h" #include "Caches.h" diff --git a/libs/hwui/Snapshot.cpp b/libs/hwui/Snapshot.cpp index beb2e1d0481cc..fd077d9c83885 100644 --- a/libs/hwui/Snapshot.cpp +++ b/libs/hwui/Snapshot.cpp @@ -14,8 +14,6 @@ * limitations under the License. */ -#define LOG_TAG "OpenGLRenderer" - #include "Snapshot.h" #include diff --git a/libs/hwui/SpotShadow.cpp b/libs/hwui/SpotShadow.cpp index b8c98041a6bf8..eaf03036b5680 100644 --- a/libs/hwui/SpotShadow.cpp +++ b/libs/hwui/SpotShadow.cpp @@ -14,8 +14,6 @@ * limitations under the License. */ -#define LOG_TAG "OpenGLRenderer" - // The highest z value can't be higher than (CASTER_Z_CAP_RATIO * light.z) #define CASTER_Z_CAP_RATIO 0.95f diff --git a/libs/hwui/TextDropShadowCache.cpp b/libs/hwui/TextDropShadowCache.cpp index 8b1d4cb2196c4..b7a76baadff55 100644 --- a/libs/hwui/TextDropShadowCache.cpp +++ b/libs/hwui/TextDropShadowCache.cpp @@ -14,8 +14,6 @@ * limitations under the License. */ -#define LOG_TAG "OpenGLRenderer" - #include #include "Caches.h" diff --git a/libs/hwui/Texture.cpp b/libs/hwui/Texture.cpp index 593e918180934..5195b457af2b6 100644 --- a/libs/hwui/Texture.cpp +++ b/libs/hwui/Texture.cpp @@ -14,8 +14,6 @@ * limitations under the License. */ -#define LOG_TAG "OpenGLRenderer" - #include #include "Caches.h" diff --git a/libs/hwui/TextureCache.cpp b/libs/hwui/TextureCache.cpp index fe1b7fdbfbbfa..5b57c9186a3f6 100644 --- a/libs/hwui/TextureCache.cpp +++ b/libs/hwui/TextureCache.cpp @@ -14,9 +14,6 @@ * limitations under the License. */ -#define LOG_TAG "OpenGLRenderer" -#define ATRACE_TAG ATRACE_TAG_VIEW - #include #include diff --git a/libs/hwui/font/Font.cpp b/libs/hwui/font/Font.cpp index 5de64a4b16545..4fb5ba41c1871 100644 --- a/libs/hwui/font/Font.cpp +++ b/libs/hwui/font/Font.cpp @@ -14,9 +14,6 @@ * limitations under the License. */ -#define LOG_TAG "OpenGLRenderer" -#define ATRACE_TAG ATRACE_TAG_VIEW - #include #include diff --git a/libs/hwui/renderstate/Stencil.h b/libs/hwui/renderstate/Stencil.h index 3a8f8ebad48d8..32618230bbf66 100644 --- a/libs/hwui/renderstate/Stencil.h +++ b/libs/hwui/renderstate/Stencil.h @@ -17,10 +17,6 @@ #ifndef ANDROID_HWUI_STENCIL_H #define ANDROID_HWUI_STENCIL_H -#ifndef LOG_TAG - #define LOG_TAG "OpenGLRenderer" -#endif - #include #include diff --git a/libs/hwui/renderthread/DrawFrameTask.cpp b/libs/hwui/renderthread/DrawFrameTask.cpp index 6507ce824e037..5cb868dc43f18 100644 --- a/libs/hwui/renderthread/DrawFrameTask.cpp +++ b/libs/hwui/renderthread/DrawFrameTask.cpp @@ -14,8 +14,6 @@ * limitations under the License. */ -#define ATRACE_TAG ATRACE_TAG_VIEW - #include "DrawFrameTask.h" #include diff --git a/libs/hwui/utils/Blur.cpp b/libs/hwui/utils/Blur.cpp index 877a42216c271..6884aedc2bff7 100644 --- a/libs/hwui/utils/Blur.cpp +++ b/libs/hwui/utils/Blur.cpp @@ -14,8 +14,6 @@ * limitations under the License. */ -#define LOG_TAG "OpenGLRenderer" - #include #include "Blur.h"