diff options
| author | Dan Albert <danalbert@google.com> | 2015-09-08 21:11:58 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-08 21:11:58 +0000 |
| commit | ca0deaf1b14ddbc87befc7e79b6f4151e1285934 (patch) | |
| tree | 9fb1a4e0633dd5a888c7d7381010af537fc757a7 | |
| parent | 21c47d486ea9bea5a16949d8db8e680c7ec730c7 (diff) | |
| parent | ef76c0660019521f1a0d7d6411266633f2409122 (diff) | |
| download | protobuf-ca0deaf1b14ddbc87befc7e79b6f4151e1285934.tar.gz | |
am ef76c066: Merge "Add *-ndk named NDK libraries."
* commit 'ef76c0660019521f1a0d7d6411266633f2409122':
Add *-ndk named NDK libraries.
| -rw-r--r-- | Android.mk | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk index 0c3b03596..7ff9cc47e 100644 --- a/Android.mk +++ b/Android.mk @@ -544,3 +544,20 @@ LOCAL_DEX_PREOPT := false include $(BUILD_PACKAGE) +# Aliases for old NDK protobuf names so we can transition other branches without +# intermediate build breakages. +# TODO(danalbert): Remove these once master is fixed. +include $(CLEAR_VARS) +LOCAL_MODULE := libprotobuf-cpp-lite-ndk +LOCAL_WHOLE_STATIC_LIBRARIES := libprotobuf-cpp-lite +include $(BUILD_STATIC_LIBRARY) + +include $(CLEAR_VARS) +LOCAL_MODULE := libprotobuf-cpp-full-ndk +LOCAL_WHOLE_STATIC_LIBRARIES := libprotobuf-cpp-full +include $(BUILD_STATIC_LIBRARY) + +include $(CLEAR_VARS) +LOCAL_MODULE := libprotobuf-cpp-full-ndk-gnustl-rtti +LOCAL_WHOLE_STATIC_LIBRARIES := libprotobuf-cpp-full-gnustl-rtti +include $(BUILD_STATIC_LIBRARY) |