diff options
| author | Jeff Davidson <jpd@google.com> | 2014-10-16 10:54:04 -0700 |
|---|---|---|
| committer | Jeff Davidson <jpd@google.com> | 2014-10-22 10:00:30 -0700 |
| commit | 18007b8462bc2f361ac9fbf89e434dd5d4e3649a (patch) | |
| tree | 7abfe1b0cdf70f22ff6fc300b9e0567d82cdbe0e /Android.mk | |
| parent | 9be7e7401174d75e87e21fdc5f43549594a714bb (diff) | |
| download | external_protobuf-18007b8462bc2f361ac9fbf89e434dd5d4e3649a.zip external_protobuf-18007b8462bc2f361ac9fbf89e434dd5d4e3649a.tar.gz external_protobuf-18007b8462bc2f361ac9fbf89e434dd5d4e3649a.tar.bz2 | |
Move protobuf 2.3.0 to prebuilts.
This will facilitate an upgrade to 2.6.0 and future versions without
breaking applications which have a hardcoded dependency on 2.3.0. The
existing make rules have been renamed to omit the version code.
The prebuilts were built from a tree at commit
9be7e7401174d75e87e21fdc5f43549594a714bb.
Change-Id: I90cf7f029217c8dc63a4b38252025c6b725d72a5
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 23 |
1 files changed, 13 insertions, 10 deletions
@@ -137,7 +137,7 @@ COMPILER_SRC_FILES := \ # ======================================================= include $(CLEAR_VARS) -LOCAL_MODULE := libprotobuf-java-2.3.0-nano +LOCAL_MODULE := libprotobuf-java-nano LOCAL_MODULE_TAGS := optional LOCAL_SDK_VERSION := 8 @@ -150,7 +150,7 @@ include $(BUILD_STATIC_JAVA_LIBRARY) # ======================================================= include $(CLEAR_VARS) -LOCAL_MODULE := host-libprotobuf-java-2.3.0-nano +LOCAL_MODULE := host-libprotobuf-java-nano LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(call all-java-files-under, java/src/main/java/com/google/protobuf/nano) @@ -161,7 +161,7 @@ include $(BUILD_HOST_JAVA_LIBRARY) # ======================================================= include $(CLEAR_VARS) -LOCAL_MODULE := libprotobuf-java-2.3.0-micro +LOCAL_MODULE := libprotobuf-java-micro LOCAL_MODULE_TAGS := optional LOCAL_SDK_VERSION := 8 @@ -173,7 +173,7 @@ include $(BUILD_STATIC_JAVA_LIBRARY) # ======================================================= include $(CLEAR_VARS) -LOCAL_MODULE := host-libprotobuf-java-2.3.0-micro +LOCAL_MODULE := host-libprotobuf-java-micro LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(call all-java-files-under, java/src/main/java/com/google/protobuf/micro) @@ -184,7 +184,7 @@ include $(BUILD_HOST_JAVA_LIBRARY) # ======================================================= include $(CLEAR_VARS) -LOCAL_MODULE := libprotobuf-java-2.3.0-lite +LOCAL_MODULE := libprotobuf-java-lite LOCAL_MODULE_TAGS := optional LOCAL_SDK_VERSION := 8 @@ -196,7 +196,7 @@ include $(BUILD_STATIC_JAVA_LIBRARY) # ======================================================= include $(CLEAR_VARS) -LOCAL_MODULE := host-libprotobuf-java-2.3.0-lite +LOCAL_MODULE := host-libprotobuf-java-lite LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(JAVA_LITE_SRC_FILES) @@ -207,7 +207,7 @@ include $(BUILD_HOST_JAVA_LIBRARY) # ======================================================= include $(CLEAR_VARS) -LOCAL_MODULE := libprotobuf-cpp-2.3.0-lite +LOCAL_MODULE := libprotobuf-cpp-lite LOCAL_MODULE_TAGS := optional LOCAL_CPP_EXTENSION := .cc @@ -275,7 +275,7 @@ protobuf_cc_full_src_files := \ # ======================================================= include $(CLEAR_VARS) -LOCAL_MODULE := libprotobuf-cpp-2.3.0-full +LOCAL_MODULE := libprotobuf-cpp-full LOCAL_MODULE_TAGS := optional LOCAL_CPP_EXTENSION := .cc LOCAL_SRC_FILES := $(protobuf_cc_full_src_files) @@ -313,7 +313,7 @@ include $(BUILD_STATIC_LIBRARY) # ======================================================= include $(CLEAR_VARS) -LOCAL_MODULE := libprotobuf-cpp-2.3.0-full-gnustl-rtti +LOCAL_MODULE := libprotobuf-cpp-full-gnustl-rtti LOCAL_MODULE_TAGS := optional LOCAL_CPP_EXTENSION := .cc LOCAL_SRC_FILES := $(protobuf_cc_full_src_files) @@ -437,10 +437,13 @@ LOCAL_SRC_FILES := $(call all-java-files-under, java/src/device/test/java/com/go LOCAL_MANIFEST_FILE := java/src/device/test/AndroidManifest.xml -LOCAL_STATIC_JAVA_LIBRARIES := libprotobuf-java-2.3.0-nano \ +LOCAL_STATIC_JAVA_LIBRARIES := libprotobuf-java-nano \ android-nano-test-parcelable \ android-nano-test-parcelable-extendable LOCAL_DEX_PREOPT := false include $(BUILD_PACKAGE) + +# 2.3.0 prebuilts for backwards compatibility. +include $(LOCAL_PATH)/prebuilts/Android.mk |