Merge "Clean up unncessary defines"

2015-07-16 20:11:02 +00:00
parent 30962d8b21 5a4690bf26
commit 1d5d34624b
37 changed files with 0 additions and 91 deletions
--- 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.
--- 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"
--- 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"
--- 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"
--- 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 <SkCanvas.h>

 #include <utils/Trace.h>
--- 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 <SkCanvas.h>
 #include <algorithm>

--- 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 <SkCamera.h>
 #include <SkMatrix.h>

--- 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"
--- a/libs/hwui/FboCache.cpp
+++ b/libs/hwui/FboCache.cpp
@@ -14,8 +14,6 @@
 * limitations under the License.
 */

-#define LOG_TAG "OpenGLRenderer"
-
 #include <stdlib.h>

 #include "Debug.h"
--- a/libs/hwui/GradientCache.cpp
+++ b/libs/hwui/GradientCache.cpp
@@ -14,8 +14,6 @@
 * limitations under the License.
 */

-#define LOG_TAG "OpenGLRenderer"
-
 #include <utils/JenkinsHash.h>

 #include "Caches.h"
--- a/libs/hwui/Image.cpp
+++ b/libs/hwui/Image.cpp
@@ -14,8 +14,6 @@
 * limitations under the License.
 */

-#define LOG_TAG "OpenGLRenderer"
-
 #include <utils/Log.h>

 #include "Caches.h"
--- 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"
--- a/libs/hwui/LayerCache.cpp
+++ b/libs/hwui/LayerCache.cpp
@@ -14,8 +14,6 @@
 * limitations under the License.
 */

-#define LOG_TAG "OpenGLRenderer"
-
 #include <GLES2/gl2.h>

 #include <utils/Log.h>
--- a/libs/hwui/Matrix.cpp
+++ b/libs/hwui/Matrix.cpp
@@ -14,8 +14,6 @@
 * limitations under the License.
 */

-#define LOG_TAG "OpenGLRenderer"
-
 #include <math.h>
 #include <stdlib.h>
 #include <string.h>
--- a/libs/hwui/Patch.cpp
+++ b/libs/hwui/Patch.cpp
@@ -14,8 +14,6 @@
 * limitations under the License.
 */

-#define LOG_TAG "OpenGLRenderer"
-
 #include <cmath>

 #include <utils/Log.h>
--- a/libs/hwui/PatchCache.cpp
+++ b/libs/hwui/PatchCache.cpp
@@ -14,8 +14,6 @@
 * limitations under the License.
 */

-#define LOG_TAG "OpenGLRenderer"
-
 #include <utils/JenkinsHash.h>
 #include <utils/Log.h>

--- 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 <SkBitmap.h>
 #include <SkCanvas.h>
 #include <SkColor.h>
--- 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

--- 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"
--- 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 <utils/Trace.h>

 #include "Program.h"
--- a/libs/hwui/ProgramCache.cpp
+++ b/libs/hwui/ProgramCache.cpp
@@ -14,8 +14,6 @@
 * limitations under the License.
 */

-#define LOG_TAG "OpenGLRenderer"
-
 #include <utils/String8.h>

 #include "Caches.h"
--- a/libs/hwui/RenderBufferCache.cpp
+++ b/libs/hwui/RenderBufferCache.cpp
@@ -14,8 +14,6 @@
 * limitations under the License.
 */

-#define LOG_TAG "OpenGLRenderer"
-
 #include <utils/Log.h>

 #include "Debug.h"
--- 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 <algorithm>
--- 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 <SkCamera.h>
 #include <SkMatrix.h>

--- 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 <utils/Trace.h>
--- 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"

--- 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 <math.h>
 #include <utils/Log.h>
 #include <utils/Trace.h>
--- 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"
--- 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 <SkCanvas.h>
--- 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

--- a/libs/hwui/TextDropShadowCache.cpp
+++ b/libs/hwui/TextDropShadowCache.cpp
@@ -14,8 +14,6 @@
 * limitations under the License.
 */

-#define LOG_TAG "OpenGLRenderer"
-
 #include <utils/JenkinsHash.h>

 #include "Caches.h"
--- a/libs/hwui/Texture.cpp
+++ b/libs/hwui/Texture.cpp
@@ -14,8 +14,6 @@
 * limitations under the License.
 */

-#define LOG_TAG "OpenGLRenderer"
-
 #include <utils/Log.h>

 #include "Caches.h"
--- 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 <GLES2/gl2.h>

 #include <SkCanvas.h>
--- 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 <cutils/compiler.h>

 #include <utils/JenkinsHash.h>
--- 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 <GLES2/gl2.h>

 #include <cutils/compiler.h>
--- 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 <utils/Log.h>
--- 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 <math.h>

 #include "Blur.h"