commit 8cc222cd3e79fa5190f3aa039a03a4cbea6cfbe7
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Nov 21 18:00:27 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Nov 21 18:00:27 2024 +0000
tree b91036e48d064fe0abca44d7e89ae2636d18103a
parent 9c981bf611b7062270039a019ec682e2c27801d2
parent 2242525f3fed34bcb9cbd6f38a90080c85210a9f

Merge "Make bpfmt happy." into main am: bb0e84c47b am: 2242525f3f

Original change: https://android-review.googlesource.com/c/platform/external/libpng/+/3368740

Change-Id: I32049437741b46320516356479777cb54605b0e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Android.bp

diff --git a/Android.bp b/Android.bp
index da4b6c9..d565f7d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -61,10 +61,10 @@
             cflags: ["-O3"],
         },
         arm64: {
-            srcs: ["arm/*",],
+            srcs: ["arm/*"],
             cflags: ["-O3"],
             exclude_srcs: [
-                "arm/filter_neon.S"
+                "arm/filter_neon.S",
             ],
         },
         x86: {
@@ -113,7 +113,7 @@
     min_sdk_version: "apex_inherit",
     apex_available: [
         "com.android.mediaprovider",
-        "//apex_available:platform"
+        "//apex_available:platform",
     ],
 }
 
@@ -137,7 +137,10 @@
     gtest: false,
     srcs: ["pngtest.c"],
     name: "pngtest",
-    cflags: ["-Wall", "-Werror"],
+    cflags: [
+        "-Wall",
+        "-Werror",
+    ],
     shared_libs: [
         "libpng",
         "libz",
@@ -146,7 +149,7 @@
 
 cc_fuzz {
     name: "libpng_read_fuzzer",
-    host_supported:true,
+    host_supported: true,
 
     static_libs: [
         "libpng",