diff options
| author | Dimitry Ivanov <dimitry@google.com> | 2015-03-10 17:14:53 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-10 17:14:53 +0000 |
| commit | a6ed1b9547dcd592031a415739cc7e672c068f7c (patch) | |
| tree | b6f67eb2d28e1b6e8ac3103e4e290751a5f84d6e /native | |
| parent | c2826fb922ba1626920907fa892cbc98e0db64a6 (diff) | |
| parent | 6e116429a8d48f9c8298f15c332cd29146694d8b (diff) | |
| download | frameworks_base-a6ed1b9547dcd592031a415739cc7e672c068f7c.zip frameworks_base-a6ed1b9547dcd592031a415739cc7e672c068f7c.tar.gz frameworks_base-a6ed1b9547dcd592031a415739cc7e672c068f7c.tar.bz2 | |
am 6e116429: Merge "Generate gnu hash for arm only"
* commit '6e116429a8d48f9c8298f15c332cd29146694d8b':
Generate gnu hash for arm only
Diffstat (limited to 'native')
| -rw-r--r-- | native/graphics/jni/Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/native/graphics/jni/Android.mk b/native/graphics/jni/Android.mk index 14575ee..b7f0fbd 100644 --- a/native/graphics/jni/Android.mk +++ b/native/graphics/jni/Android.mk @@ -31,7 +31,7 @@ LOCAL_MODULE:= libjnigraphics LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code # TODO: This is to work around b/19059885. Remove after root cause is fixed -LOCAL_LDFLAGS := -Wl,--hash-style=both +LOCAL_LDFLAGS_arm := -Wl,--hash-style=both include $(BUILD_SHARED_LIBRARY) |