am a12fbb0a: am 1ed1ec36: Merge "Move protobuf 2.3.0 to prebuilts."

* commit 'a12fbb0a425580dc03d2947faa79530e38b08b54':
  Move protobuf 2.3.0 to prebuilts.

27 files changed, 110 insertions, 10 deletions

diff --git a/.gitignore b/.gitignore
index ac1b297..992ab5c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,3 +55,4 @@ src/testzip.proto
 src/testzip.zip
 vsprojects/config.h
 java/target/
+!prebuilts/**
diff --git a/Android.mk b/Android.mk
index f042d82..9471aba 100644
--- a/Android.mk
+++ b/Android.mk
@@ -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
diff --git a/prebuilts/Android.mk b/prebuilts/Android.mk
new file mode 100644
index 0000000..82a4157
--- /dev/null
+++ b/prebuilts/Android.mk
@@ -0,0 +1,96 @@
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#
+
+# Prebuilts of the old 2.3.0 libprotobuf library.
+# DEPRECATED: It is rare that you should need to depend on these libraries
+# directly. Instead prefer setting LOCAL_PROTOC_OPTIMIZE_TYPE which will
+# automatically pull in any dependent libraries, or using the versionless
+# definitions of these libraries.
+
+# Device Java prebuilts
+
+include $(CLEAR_VARS)
+
+LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := \
+    libprotobuf-java-2.3.0-lite:prebuilts/libprotobuf-java-2.3.0-lite.jar \
+    libprotobuf-java-2.3.0-micro:prebuilts/libprotobuf-java-2.3.0-micro.jar \
+    libprotobuf-java-2.3.0-nano:prebuilts/libprotobuf-java-2.3.0-nano.jar
+
+include $(BUILD_MULTI_PREBUILT)
+
+# Host Java prebuilts
+
+include $(CLEAR_VARS)
+
+LOCAL_IS_HOST_MODULE := true
+
+LOCAL_PREBUILT_JAVA_LIBRARIES := \
+    host-libprotobuf-java-2.3.0-lite:prebuilts/host-libprotobuf-java-2.3.0-lite.jar \
+    host-libprotobuf-java-2.3.0-micro:prebuilts/host-libprotobuf-java-2.3.0-micro.jar \
+    host-libprotobuf-java-2.3.0-nano:prebuilts/host-libprotobuf-java-2.3.0-nano.jar
+
+include $(BUILD_MULTI_PREBUILT)
+
+# Device C++ static library prebuilts
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := libprotobuf-cpp-2.3.0-full
+LOCAL_MODULE_CLASS := STATIC_LIBRARIES
+LOCAL_MODULE_SUFFIX := .a
+LOCAL_SRC_FILES_arm := prebuilts/arm/libprotobuf-cpp-2.3.0-full.a
+LOCAL_SRC_FILES_arm64 := prebuilts/arm64/libprotobuf-cpp-2.3.0-full.a
+LOCAL_SRC_FILES_mips := prebuilts/mips/libprotobuf-cpp-2.3.0-full.a
+LOCAL_SRC_FILES_mips64 := prebuilts/mips64/libprotobuf-cpp-2.3.0-full.a
+LOCAL_SRC_FILES_x86 := prebuilts/x86/libprotobuf-cpp-2.3.0-full.a
+LOCAL_SRC_FILES_x86_64 := prebuilts/x86_64/libprotobuf-cpp-2.3.0-full.a
+LOCAL_MODULE_TARGET_ARCH := arm arm64 mips mips64 x86 x86_64
+LOCAL_MULTILIB := both
+
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := libprotobuf-cpp-2.3.0-full-gnustl-rtti
+LOCAL_MODULE_CLASS := STATIC_LIBRARIES
+LOCAL_MODULE_SUFFIX := .a
+LOCAL_SRC_FILES_arm := prebuilts/arm/libprotobuf-cpp-2.3.0-full-gnustl-rtti.a
+LOCAL_SRC_FILES_arm64 := prebuilts/arm64/libprotobuf-cpp-2.3.0-full-gnustl-rtti.a
+LOCAL_SRC_FILES_mips := prebuilts/mips/libprotobuf-cpp-2.3.0-full-gnustl-rtti.a
+LOCAL_SRC_FILES_mips64 := prebuilts/mips64/libprotobuf-cpp-2.3.0-full-gnustl-rtti.a
+LOCAL_SRC_FILES_x86 := prebuilts/x86/libprotobuf-cpp-2.3.0-full-gnustl-rtti.a
+LOCAL_SRC_FILES_x86_64 := prebuilts/x86_64/libprotobuf-cpp-2.3.0-full-gnustl-rtti.a
+LOCAL_MODULE_TARGET_ARCH := arm arm64 mips mips64 x86 x86_64
+LOCAL_MULTILIB := both
+
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := libprotobuf-cpp-2.3.0-lite
+LOCAL_MODULE_CLASS := STATIC_LIBRARIES
+LOCAL_MODULE_SUFFIX := .a
+LOCAL_SRC_FILES_arm := prebuilts/arm/libprotobuf-cpp-2.3.0-lite.a
+LOCAL_SRC_FILES_arm64 := prebuilts/arm64/libprotobuf-cpp-2.3.0-lite.a
+LOCAL_SRC_FILES_mips := prebuilts/mips/libprotobuf-cpp-2.3.0-lite.a
+LOCAL_SRC_FILES_mips64 := prebuilts/mips64/libprotobuf-cpp-2.3.0-lite.a
+LOCAL_SRC_FILES_x86 := prebuilts/x86/libprotobuf-cpp-2.3.0-lite.a
+LOCAL_SRC_FILES_x86_64 := prebuilts/x86_64/libprotobuf-cpp-2.3.0-lite.a
+LOCAL_MODULE_TARGET_ARCH := arm arm64 mips mips64 x86 x86_64
+LOCAL_MULTILIB := both
+
+include $(BUILD_PREBUILT)
+
diff --git a/prebuilts/arm/libprotobuf-cpp-2.3.0-full-gnustl-rtti.a b/prebuilts/arm/libprotobuf-cpp-2.3.0-full-gnustl-rtti.a
new file mode 100644
index 0000000..5d8356b
--- /dev/null
+++ b/prebuilts/arm/libprotobuf-cpp-2.3.0-full-gnustl-rtti.a
diff --git a/prebuilts/arm/libprotobuf-cpp-2.3.0-full.a b/prebuilts/arm/libprotobuf-cpp-2.3.0-full.a
new file mode 100644
index 0000000..13caee8
--- /dev/null
+++ b/prebuilts/arm/libprotobuf-cpp-2.3.0-full.a
diff --git a/prebuilts/arm/libprotobuf-cpp-2.3.0-lite.a b/prebuilts/arm/libprotobuf-cpp-2.3.0-lite.a
new file mode 100644
index 0000000..298b308
--- /dev/null
+++ b/prebuilts/arm/libprotobuf-cpp-2.3.0-lite.a
diff --git a/prebuilts/arm64/libprotobuf-cpp-2.3.0-full-gnustl-rtti.a b/prebuilts/arm64/libprotobuf-cpp-2.3.0-full-gnustl-rtti.a
new file mode 100644
index 0000000..cea2882
--- /dev/null
+++ b/prebuilts/arm64/libprotobuf-cpp-2.3.0-full-gnustl-rtti.a
diff --git a/prebuilts/arm64/libprotobuf-cpp-2.3.0-full.a b/prebuilts/arm64/libprotobuf-cpp-2.3.0-full.a
new file mode 100644
index 0000000..5a22df1
--- /dev/null
+++ b/prebuilts/arm64/libprotobuf-cpp-2.3.0-full.a
diff --git a/prebuilts/arm64/libprotobuf-cpp-2.3.0-lite.a b/prebuilts/arm64/libprotobuf-cpp-2.3.0-lite.a
new file mode 100644
index 0000000..ab198ea
--- /dev/null
+++ b/prebuilts/arm64/libprotobuf-cpp-2.3.0-lite.a
diff --git a/prebuilts/host-libprotobuf-java-2.3.0-lite.jar b/prebuilts/host-libprotobuf-java-2.3.0-lite.jar
new file mode 100644
index 0000000..77a9617
--- /dev/null
+++ b/prebuilts/host-libprotobuf-java-2.3.0-lite.jar
diff --git a/prebuilts/host-libprotobuf-java-2.3.0-micro.jar b/prebuilts/host-libprotobuf-java-2.3.0-micro.jar
new file mode 100644
index 0000000..9cedc4a
--- /dev/null
+++ b/prebuilts/host-libprotobuf-java-2.3.0-micro.jar
diff --git a/prebuilts/host-libprotobuf-java-2.3.0-nano.jar b/prebuilts/host-libprotobuf-java-2.3.0-nano.jar
new file mode 100644
index 0000000..660b94a
--- /dev/null
+++ b/prebuilts/host-libprotobuf-java-2.3.0-nano.jar
diff --git a/prebuilts/libprotobuf-java-2.3.0-lite.jar b/prebuilts/libprotobuf-java-2.3.0-lite.jar
new file mode 100644
index 0000000..12f8512
--- /dev/null
+++ b/prebuilts/libprotobuf-java-2.3.0-lite.jar
diff --git a/prebuilts/libprotobuf-java-2.3.0-micro.jar b/prebuilts/libprotobuf-java-2.3.0-micro.jar
new file mode 100644
index 0000000..95aa84e
--- /dev/null
+++ b/prebuilts/libprotobuf-java-2.3.0-micro.jar
diff --git a/prebuilts/libprotobuf-java-2.3.0-nano.jar b/prebuilts/libprotobuf-java-2.3.0-nano.jar
new file mode 100644
index 0000000..054cd1e
--- /dev/null
+++ b/prebuilts/libprotobuf-java-2.3.0-nano.jar
diff --git a/prebuilts/mips/libprotobuf-cpp-2.3.0-full-gnustl-rtti.a b/prebuilts/mips/libprotobuf-cpp-2.3.0-full-gnustl-rtti.a
new file mode 100644
index 0000000..8fa3d05
--- /dev/null
+++ b/prebuilts/mips/libprotobuf-cpp-2.3.0-full-gnustl-rtti.a
diff --git a/prebuilts/mips/libprotobuf-cpp-2.3.0-full.a b/prebuilts/mips/libprotobuf-cpp-2.3.0-full.a
new file mode 100644
index 0000000..063daae
--- /dev/null
+++ b/prebuilts/mips/libprotobuf-cpp-2.3.0-full.a
diff --git a/prebuilts/mips/libprotobuf-cpp-2.3.0-lite.a b/prebuilts/mips/libprotobuf-cpp-2.3.0-lite.a
new file mode 100644
index 0000000..8e4be02
--- /dev/null
+++ b/prebuilts/mips/libprotobuf-cpp-2.3.0-lite.a
diff --git a/prebuilts/mips64/libprotobuf-cpp-2.3.0-full-gnustl-rtti.a b/prebuilts/mips64/libprotobuf-cpp-2.3.0-full-gnustl-rtti.a
new file mode 100644
index 0000000..e3092b8
--- /dev/null
+++ b/prebuilts/mips64/libprotobuf-cpp-2.3.0-full-gnustl-rtti.a
diff --git a/prebuilts/mips64/libprotobuf-cpp-2.3.0-full.a b/prebuilts/mips64/libprotobuf-cpp-2.3.0-full.a
new file mode 100644
index 0000000..5e48b8b
--- /dev/null
+++ b/prebuilts/mips64/libprotobuf-cpp-2.3.0-full.a
diff --git a/prebuilts/mips64/libprotobuf-cpp-2.3.0-lite.a b/prebuilts/mips64/libprotobuf-cpp-2.3.0-lite.a
new file mode 100644
index 0000000..86d6a21
--- /dev/null
+++ b/prebuilts/mips64/libprotobuf-cpp-2.3.0-lite.a
diff --git a/prebuilts/x86/libprotobuf-cpp-2.3.0-full-gnustl-rtti.a b/prebuilts/x86/libprotobuf-cpp-2.3.0-full-gnustl-rtti.a
new file mode 100644
index 0000000..6ddf739
--- /dev/null
+++ b/prebuilts/x86/libprotobuf-cpp-2.3.0-full-gnustl-rtti.a
diff --git a/prebuilts/x86/libprotobuf-cpp-2.3.0-full.a b/prebuilts/x86/libprotobuf-cpp-2.3.0-full.a
new file mode 100644
index 0000000..e4bab62
--- /dev/null
+++ b/prebuilts/x86/libprotobuf-cpp-2.3.0-full.a
diff --git a/prebuilts/x86/libprotobuf-cpp-2.3.0-lite.a b/prebuilts/x86/libprotobuf-cpp-2.3.0-lite.a
new file mode 100644
index 0000000..36c1aa2
--- /dev/null
+++ b/prebuilts/x86/libprotobuf-cpp-2.3.0-lite.a
diff --git a/prebuilts/x86_64/libprotobuf-cpp-2.3.0-full-gnustl-rtti.a b/prebuilts/x86_64/libprotobuf-cpp-2.3.0-full-gnustl-rtti.a
new file mode 100644
index 0000000..5e48557
--- /dev/null
+++ b/prebuilts/x86_64/libprotobuf-cpp-2.3.0-full-gnustl-rtti.a
diff --git a/prebuilts/x86_64/libprotobuf-cpp-2.3.0-full.a b/prebuilts/x86_64/libprotobuf-cpp-2.3.0-full.a
new file mode 100644
index 0000000..b0dab22
--- /dev/null
+++ b/prebuilts/x86_64/libprotobuf-cpp-2.3.0-full.a
diff --git a/prebuilts/x86_64/libprotobuf-cpp-2.3.0-lite.a b/prebuilts/x86_64/libprotobuf-cpp-2.3.0-lite.a
new file mode 100644
index 0000000..48ffb56
--- /dev/null
+++ b/prebuilts/x86_64/libprotobuf-cpp-2.3.0-lite.a