diff options
| author | Dimitry Ivanov <dimitry@google.com> | 2015-03-11 20:09:17 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-11 20:09:17 +0000 |
| commit | b8d342da4e16ced2290c1c19b96057e8be5b9318 (patch) | |
| tree | 63e3121f4ff30f8ab83adf1ecc70dcd115caf5a1 /native | |
| parent | 41cd70e3647c3ce3faeb285b219d0c0637d97bf6 (diff) | |
| parent | 3b9cfe30ed4ae34d06a8f005c8ada593c314316b (diff) | |
| download | frameworks_base-b8d342da4e16ced2290c1c19b96057e8be5b9318.zip frameworks_base-b8d342da4e16ced2290c1c19b96057e8be5b9318.tar.gz frameworks_base-b8d342da4e16ced2290c1c19b96057e8be5b9318.tar.bz2 | |
am 3b9cfe30: am a6ed1b95: am 6e116429: Merge "Generate gnu hash for arm only"
* commit '3b9cfe30ed4ae34d06a8f005c8ada593c314316b':
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) |