aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2020-12-11 20:14:55 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-12-11 20:14:55 +0000
commit1868b00e81707d40a06fa73862b25127ed949ea9 (patch)
treeeb188699c54a01da2a84d80da1bd777c62758c06
parent51cbf916ed6877dc33c2cd40422dd830b2bcca2a (diff)
parent5c44010b7005dbfb9ff59e6beac236693d622865 (diff)
downloadlibpng-1868b00e81707d40a06fa73862b25127ed949ea9.tar.gz
Merge "arm64: armv7 assembly file is not needed." am: c3d410dc7a am: 06705ae977 am: 5c44010b70
Original change: https://android-review.googlesource.com/c/platform/external/libpng/+/1525814 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8c92288049ee3073cdab9c6608921f21fdafbc2a
-rw-r--r--Android.bp3
1 files changed, 3 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
index 5e3158c2d..58e145b8c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -22,6 +22,9 @@ cc_defaults {
arm64: {
srcs: ["arm/*",],
cflags: ["-O3"],
+ exclude_srcs: [
+ "arm/filter_neon.S"
+ ],
},
x86: {
srcs: ["intel/*"],