commit 06705ae977de352f79076fd3a0ac12215d8e68a3
author Treehugger Robot <treehugger-gerrit@google.com> Fri Dec 11 19:46:41 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Dec 11 19:46:41 2020 +0000
tree eb188699c54a01da2a84d80da1bd777c62758c06
parent 572f248e8791636f8c2afd05931bde07b398e343
parent c3d410dc7a55c1e1ffcbd81532a4e09cc353443d

Merge "arm64: armv7 assembly file is not needed." am: c3d410dc7a

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If482ce63ac58970e87ef603c2cb9f32262b9f48a

Android.bp

diff --git a/Android.bp b/Android.bp
index 5e3158c..58e145b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -22,6 +22,9 @@
         arm64: {
             srcs: ["arm/*",],
             cflags: ["-O3"],
+            exclude_srcs: [
+                "arm/filter_neon.S"
+            ],
         },
         x86: {
             srcs: ["intel/*"],