Cleanup LOG_TAG when bundled in HWUI

Bug: 137655431
Test: CtsUiRenderingTestCases
Change-Id: If0f1377e0ab831f38d752c3bbe282397c061b02c

core/jni/android_graphics_SurfaceTexture.cpp

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#undef LOG_TAG
 #define LOG_TAG "SurfaceTexture"
 
 #include <stdio.h>

libs/hwui/apex/android_bitmap.cpp

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#undef LOG_TAG
 #define LOG_TAG "Bitmap"
 #include <log/log.h>
 

libs/hwui/apex/jni_runtime.cpp

@@ -24,6 +24,7 @@
 #include <Properties.h>
 #include <SkGraphics.h>
 
+#undef LOG_TAG
 #define LOG_TAG "AndroidGraphicsJNI"
 
 extern int register_android_graphics_Bitmap(JNIEnv*);

libs/hwui/jni/Bitmap.cpp

@@ -1,3 +1,4 @@
+#undef LOG_TAG
 #define LOG_TAG "Bitmap"
 #include "Bitmap.h"
 

libs/hwui/jni/BitmapFactory.cpp

@@ -1,3 +1,4 @@
+#undef LOG_TAG
 #define LOG_TAG "BitmapFactory"
 
 #include "BitmapFactory.h"

libs/hwui/jni/BitmapRegionDecoder.cpp

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#undef LOG_TAG
 #define LOG_TAG "BitmapRegionDecoder"
 
 #include "BitmapFactory.h"

libs/hwui/jni/FontFamily.cpp

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#undef LOG_TAG
 #define LOG_TAG "Minikin"
 
 #include <nativehelper/JNIHelp.h>

libs/hwui/jni/Graphics.cpp

@@ -1,3 +1,4 @@
+#undef LOG_TAG
 #define LOG_TAG "GraphicsJNI"
 
 #include <unistd.h>

libs/hwui/jni/GraphicsStatsService.cpp

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#undef LOG_TAG
 #define LOG_TAG "GraphicsStatsService"
 
 #include <JankTracker.h>

libs/hwui/jni/NinePatch.cpp

@@ -15,6 +15,7 @@
 ** limitations under the License.
 */
 
+#undef LOG_TAG
 #define LOG_TAG "9patch"
 #define LOG_NDEBUG 1
 

libs/hwui/jni/Paint.cpp

@@ -15,6 +15,7 @@
 ** limitations under the License.
 */
 
+#undef LOG_TAG
 #define LOG_TAG "Paint"
 
 #include <utils/Log.h>

libs/hwui/jni/android_graphics_DisplayListCanvas.cpp

@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-#define LOG_TAG "OpenGLRenderer"
-
 #include "jni.h"
 #include "GraphicsJNI.h"
 #include <nativehelper/JNIHelp.h>

libs/hwui/jni/android_graphics_HardwareRenderer.cpp

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#undef LOG_TAG
 #define LOG_TAG "ThreadedRenderer"
 #define ATRACE_TAG ATRACE_TAG_VIEW
 

libs/hwui/jni/android_graphics_RenderNode.cpp

@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-#define LOG_TAG "OpenGLRenderer"
 #define ATRACE_TAG ATRACE_TAG_VIEW
 #include "jni.h"
 #include "GraphicsJNI.h"

libs/hwui/jni/android_graphics_TextureLayer.cpp

@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-#define LOG_TAG "OpenGLRenderer"
-
 #include "jni.h"
 #include <nativehelper/JNIHelp.h>
 

libs/hwui/jni/android_graphics_drawable_AnimatedVectorDrawable.cpp

@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#define LOG_TAG "OpenGLRenderer"
 
 #include "android/log.h"
 

libs/hwui/jni/fonts/Font.cpp

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#undef LOG_TAG
 #define LOG_TAG "Minikin"
 
 #include <nativehelper/JNIHelp.h>

libs/hwui/jni/fonts/FontFamily.cpp

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#undef LOG_TAG
 #define LOG_TAG "Minikin"
 
 #include <nativehelper/JNIHelp.h>

libs/hwui/jni/pdf/PdfEditor.cpp

@@ -13,6 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+#undef LOG_TAG
 #define LOG_TAG "PdfEditor"
 
 #include <sys/types.h>

libs/hwui/jni/pdf/PdfUtils.cpp

@@ -21,6 +21,7 @@
 
 #include "fpdfview.h"
 
+#undef LOG_TAG
 #define LOG_TAG "PdfUtils"
 #include <utils/Log.h>
 

libs/hwui/jni/text/LineBreaker.cpp

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#undef LOG_TAG
 #define LOG_TAG "LineBreaker"
 
 #include "utils/misc.h"

libs/hwui/jni/text/MeasuredText.cpp

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#undef LOG_TAG
 #define LOG_TAG "MeasuredText"
 
 #include "GraphicsJNI.h"