diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2014-12-11 01:08:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-12-11 01:08:12 +0000 |
| commit | 07a4f67e39d921a0a44a09e2ee67449dcfd66614 (patch) | |
| tree | 85588f76c7614a43b038ee8602290b9266bcb4cd | |
| parent | 0df1724cbd2a9155d34c4ce5739ea29e18b33b52 (diff) | |
| parent | b1ef7bf2ba82e798797d1a646c97e7e8bd5f4e83 (diff) | |
| download | pixman-master.tar.gz | |
Merge "Suppress clang assembler until the .S file is fixed."HEADandroid-wear-5.1.1_r1android-wear-5.1.0_r1android-wear-5.0.0_r1master-soongmastermainlollipop-wear-releaseemu-master-devemu-30-releaseemu-29.0-releaseaosp-emu-30-release
| -rw-r--r-- | pixman/Android.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pixman/Android.mk b/pixman/Android.mk index eb9436a..656a898 100644 --- a/pixman/Android.mk +++ b/pixman/Android.mk @@ -2,6 +2,9 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) +# pixman-android-neon.S uses gcc-specific directive. +LOCAL_CLANG_ASFLAGS_arm += -no-integrated-as + LOCAL_SDK_VERSION := 14 LOCAL_MODULE := libpixman |