aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWink Saville <wink@google.com>2010-05-27 15:44:42 -0700
committerWink Saville <wink@google.com>2010-05-27 15:44:42 -0700
commit79a4a60053f74ab71c7c3ec436d2f6caedc5be61 (patch)
tree4c702c591006114e767a8435f0631cbf0c1b5092
parent3e6833eec60b81e825555d5a3bfc91a08c6e9df3 (diff)
downloadexternal_protobuf-79a4a60053f74ab71c7c3ec436d2f6caedc5be61.zip
external_protobuf-79a4a60053f74ab71c7c3ec436d2f6caedc5be61.tar.gz
external_protobuf-79a4a60053f74ab71c7c3ec436d2f6caedc5be61.tar.bz2
The Android specific files prior to adding protobuf 2.2.0a sources.
Change-Id: Ib1009c088a3815c9152385e2b764a2c7cd28317e
-rw-r--r--Android.mk18
-rw-r--r--MODULE_LICENSE_BSD_LIKE0
-rw-r--r--README.android14
3 files changed, 32 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
new file mode 100644
index 0000000..9285744
--- /dev/null
+++ b/Android.mk
@@ -0,0 +1,18 @@
+# Copyright (C) 2010 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.
+
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+
+# TODO: Add code to build the javamicro library
diff --git a/MODULE_LICENSE_BSD_LIKE b/MODULE_LICENSE_BSD_LIKE
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/MODULE_LICENSE_BSD_LIKE
diff --git a/README.android b/README.android
new file mode 100644
index 0000000..a3ff250
--- /dev/null
+++ b/README.android
@@ -0,0 +1,14 @@
+URL: http://code.google.com/p/protobuf/downloads/list
+Version: 2.2.0a
+License: Google BSD like
+Description: "Protobuf: The Google protobuf compiler and runtimes for various languages"
+
+Local Modifications: Initial changes include support for the javamicro
+runtime, see java/README.txt for more details.
+
+Protocol Buffers are a way of encoding structured data in an efficient
+yet extensible format. Google uses Protocol Buffers for almost all
+of its internal RPC protocols and file formats.
+
+Initially the protoc compiler is not integrated into the Android build system
+and the Android.mk will simply build the javamicro runtime static library.