diff options
author | Derek Sollenberger <djsollen@google.com> | 2019-10-25 11:20:03 -0400 |
---|---|---|
committer | Derek Sollenberger <djsollen@google.com> | 2020-02-19 21:13:34 -0500 |
commit | 5368eda5127701dc84b9e4da61dfbfa685a00b2d (patch) | |
tree | 5ed8080820e6c6b0c63f9a4d45c1ccaba9d2ec51 /libs | |
parent | 83ccff716f160d3f9665732d50a7974f5f8e890a (diff) | |
download | base-5368eda5127701dc84b9e4da61dfbfa685a00b2d.tar.gz |
Cleanup LOG_TAG when bundled in HWUI
Bug: 137655431
Test: CtsUiRenderingTestCases
Change-Id: If0f1377e0ab831f38d752c3bbe282397c061b02c
Diffstat (limited to 'libs')
21 files changed, 18 insertions, 6 deletions
diff --git a/libs/hwui/apex/android_bitmap.cpp b/libs/hwui/apex/android_bitmap.cpp index decd19071944..b56a619b00aa 100644 --- a/libs/hwui/apex/android_bitmap.cpp +++ b/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> diff --git a/libs/hwui/apex/jni_runtime.cpp b/libs/hwui/apex/jni_runtime.cpp index 506c57802e32..c674f9363821 100644 --- a/libs/hwui/apex/jni_runtime.cpp +++ b/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*); diff --git a/libs/hwui/jni/Bitmap.cpp b/libs/hwui/jni/Bitmap.cpp index 130322aaaa45..1f2ce8ea6c81 100755 --- a/libs/hwui/jni/Bitmap.cpp +++ b/libs/hwui/jni/Bitmap.cpp @@ -1,3 +1,4 @@ +#undef LOG_TAG #define LOG_TAG "Bitmap" #include "Bitmap.h" diff --git a/libs/hwui/jni/BitmapFactory.cpp b/libs/hwui/jni/BitmapFactory.cpp index adedffdd731c..48a5783e6464 100644 --- a/libs/hwui/jni/BitmapFactory.cpp +++ b/libs/hwui/jni/BitmapFactory.cpp @@ -1,3 +1,4 @@ +#undef LOG_TAG #define LOG_TAG "BitmapFactory" #include "BitmapFactory.h" diff --git a/libs/hwui/jni/BitmapRegionDecoder.cpp b/libs/hwui/jni/BitmapRegionDecoder.cpp index 06b4ff849097..3f80f03d7a45 100644 --- a/libs/hwui/jni/BitmapRegionDecoder.cpp +++ b/libs/hwui/jni/BitmapRegionDecoder.cpp @@ -14,6 +14,7 @@ * limitations under the License. */ +#undef LOG_TAG #define LOG_TAG "BitmapRegionDecoder" #include "BitmapFactory.h" diff --git a/libs/hwui/jni/FontFamily.cpp b/libs/hwui/jni/FontFamily.cpp index 0fd9cc7e9989..f0cdb5e2b8c3 100644 --- a/libs/hwui/jni/FontFamily.cpp +++ b/libs/hwui/jni/FontFamily.cpp @@ -14,6 +14,7 @@ * limitations under the License. */ +#undef LOG_TAG #define LOG_TAG "Minikin" #include <nativehelper/JNIHelp.h> diff --git a/libs/hwui/jni/Graphics.cpp b/libs/hwui/jni/Graphics.cpp index 38fb8bdc1f7a..37958645f406 100644 --- a/libs/hwui/jni/Graphics.cpp +++ b/libs/hwui/jni/Graphics.cpp @@ -1,3 +1,4 @@ +#undef LOG_TAG #define LOG_TAG "GraphicsJNI" #include <unistd.h> diff --git a/libs/hwui/jni/GraphicsStatsService.cpp b/libs/hwui/jni/GraphicsStatsService.cpp index ef0aacc4d9ec..2ce392daeb87 100644 --- a/libs/hwui/jni/GraphicsStatsService.cpp +++ b/libs/hwui/jni/GraphicsStatsService.cpp @@ -14,6 +14,7 @@ * limitations under the License. */ +#undef LOG_TAG #define LOG_TAG "GraphicsStatsService" #include <JankTracker.h> diff --git a/libs/hwui/jni/NinePatch.cpp b/libs/hwui/jni/NinePatch.cpp index 15f951688d43..988615524cca 100644 --- a/libs/hwui/jni/NinePatch.cpp +++ b/libs/hwui/jni/NinePatch.cpp @@ -15,6 +15,7 @@ ** limitations under the License. */ +#undef LOG_TAG #define LOG_TAG "9patch" #define LOG_NDEBUG 1 diff --git a/libs/hwui/jni/Paint.cpp b/libs/hwui/jni/Paint.cpp index 8e1bc8489baa..7dda47b30578 100644 --- a/libs/hwui/jni/Paint.cpp +++ b/libs/hwui/jni/Paint.cpp @@ -15,6 +15,7 @@ ** limitations under the License. */ +#undef LOG_TAG #define LOG_TAG "Paint" #include <utils/Log.h> diff --git a/libs/hwui/jni/android_graphics_DisplayListCanvas.cpp b/libs/hwui/jni/android_graphics_DisplayListCanvas.cpp index 9907da5a2e68..ca10c1e6561b 100644 --- a/libs/hwui/jni/android_graphics_DisplayListCanvas.cpp +++ b/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> diff --git a/libs/hwui/jni/android_graphics_HardwareRenderer.cpp b/libs/hwui/jni/android_graphics_HardwareRenderer.cpp index 93449ffeae1b..76bfce8ab5d7 100644 --- a/libs/hwui/jni/android_graphics_HardwareRenderer.cpp +++ b/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 diff --git a/libs/hwui/jni/android_graphics_RenderNode.cpp b/libs/hwui/jni/android_graphics_RenderNode.cpp index a8246c7d84b7..a5b9e5e6a28e 100644 --- a/libs/hwui/jni/android_graphics_RenderNode.cpp +++ b/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" diff --git a/libs/hwui/jni/android_graphics_TextureLayer.cpp b/libs/hwui/jni/android_graphics_TextureLayer.cpp index 40f618025f99..e8043d2438bd 100644 --- a/libs/hwui/jni/android_graphics_TextureLayer.cpp +++ b/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> diff --git a/libs/hwui/jni/android_graphics_drawable_AnimatedVectorDrawable.cpp b/libs/hwui/jni/android_graphics_drawable_AnimatedVectorDrawable.cpp index b6b53666e26e..12465566eceb 100644 --- a/libs/hwui/jni/android_graphics_drawable_AnimatedVectorDrawable.cpp +++ b/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" diff --git a/libs/hwui/jni/fonts/Font.cpp b/libs/hwui/jni/fonts/Font.cpp index bfb9bae45f0c..d53883298f5b 100644 --- a/libs/hwui/jni/fonts/Font.cpp +++ b/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> diff --git a/libs/hwui/jni/fonts/FontFamily.cpp b/libs/hwui/jni/fonts/FontFamily.cpp index b0d10c356a9b..26d70a0a2c9c 100644 --- a/libs/hwui/jni/fonts/FontFamily.cpp +++ b/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> diff --git a/libs/hwui/jni/pdf/PdfEditor.cpp b/libs/hwui/jni/pdf/PdfEditor.cpp index 10c30260d7e3..545f4c521ae8 100644 --- a/libs/hwui/jni/pdf/PdfEditor.cpp +++ b/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> diff --git a/libs/hwui/jni/pdf/PdfUtils.cpp b/libs/hwui/jni/pdf/PdfUtils.cpp index 36355ebbefc4..06d202828b85 100644 --- a/libs/hwui/jni/pdf/PdfUtils.cpp +++ b/libs/hwui/jni/pdf/PdfUtils.cpp @@ -21,6 +21,7 @@ #include "fpdfview.h" +#undef LOG_TAG #define LOG_TAG "PdfUtils" #include <utils/Log.h> diff --git a/libs/hwui/jni/text/LineBreaker.cpp b/libs/hwui/jni/text/LineBreaker.cpp index 8dae6558bb0d..02963d8d6072 100644 --- a/libs/hwui/jni/text/LineBreaker.cpp +++ b/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" diff --git a/libs/hwui/jni/text/MeasuredText.cpp b/libs/hwui/jni/text/MeasuredText.cpp index 3b5ecbcd1d35..e001bd44dc78 100644 --- a/libs/hwui/jni/text/MeasuredText.cpp +++ b/libs/hwui/jni/text/MeasuredText.cpp @@ -14,6 +14,7 @@ * limitations under the License. */ +#undef LOG_TAG #define LOG_TAG "MeasuredText" #include "GraphicsJNI.h" |