diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2014-11-17 22:21:40 +0000 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2014-11-17 22:21:41 +0000 |
| commit | 9ef17c4b5a706de802c35bbce7d568ef203a6ac9 (patch) | |
| tree | 56c63c6f15984aab24e37fd2f2b3bbea19de3f66 /native/jni/Android.mk | |
| parent | 1a8ae0549dda4b0e3bb80623f4f87027a0fbfabf (diff) | |
| parent | fc811967411dece7ce21c58457998f6c513590a7 (diff) | |
| download | latinime-9ef17c4b5a706de802c35bbce7d568ef203a6ac9.tar.gz latinime-9ef17c4b5a706de802c35bbce7d568ef203a6ac9.tar.xz latinime-9ef17c4b5a706de802c35bbce7d568ef203a6ac9.zip | |
Merge "Revert "Follow up to https://android-review.googlesource.com/114561""
Diffstat (limited to 'native/jni/Android.mk')
| -rw-r--r-- | native/jni/Android.mk | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/native/jni/Android.mk b/native/jni/Android.mk index 402cb3b67..6003a6f64 100644 --- a/native/jni/Android.mk +++ b/native/jni/Android.mk @@ -92,9 +92,6 @@ LOCAL_SDK_VERSION := 14 LOCAL_NDK_STL_VARIANT := c++_static LOCAL_LDFLAGS += -ldl -# TODO: Figure out what we should do with --hash-style=gnu for unbundled builds -LOCAL_LDFLAGS += -Wl,--hash-style=sysv - include $(BUILD_SHARED_LIBRARY) #################### Clean up the tmp vars include $(LOCAL_PATH)/CleanupNativeFileList.mk |