summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2010-10-05 10:26:11 -0700
committerJean-Baptiste Queru <jbq@google.com>2010-10-05 10:26:34 -0700
commitb854f4d90094e0e0b3b63b199fd9c26279d77245 (patch)
treed619092abf3d72204b27d70bee9e5d934a9197ab
parent373caa091181f70951688e5b34eafd3bcac96716 (diff)
downloadexternal_protobuf-b854f4d90094e0e0b3b63b199fd9c26279d77245.zip
external_protobuf-b854f4d90094e0e0b3b63b199fd9c26279d77245.tar.gz
external_protobuf-b854f4d90094e0e0b3b63b199fd9c26279d77245.tar.bz2
Make these modules optional.
This allows compiling this code in Gingerbread. Bug: 3064326 Change-Id: Idab78a5a31a3c2fc35bcdb773aaecf1e4fb70bcb
-rw-r--r--Android.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index 4ade77c..7281a76 100644
--- a/Android.mk
+++ b/Android.mk
@@ -53,6 +53,7 @@ JAVA_LITE_SRC_FILES := \
include $(CLEAR_VARS)
LOCAL_MODULE := libprotobuf-java-2.3.0-micro
+LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := $(call all-java-files-under, java/src/main/java/com/google/protobuf/micro)
@@ -74,6 +75,7 @@ include $(BUILD_HOST_JAVA_LIBRARY)
include $(CLEAR_VARS)
LOCAL_MODULE := libprotobuf-java-2.3.0-lite
+LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := $(JAVA_LITE_SRC_FILES)
@@ -95,6 +97,7 @@ include $(BUILD_HOST_JAVA_LIBRARY)
include $(CLEAR_VARS)
LOCAL_MODULE := libprotobuf-cpp-2.3.0-lite
+LOCAL_MODULE_TAGS := optional
LOCAL_CPP_EXTENSION := .cc
@@ -135,6 +138,7 @@ include $(BUILD_STATIC_LIBRARY)
include $(CLEAR_VARS)
LOCAL_MODULE := libprotobuf-cpp-2.3.0-full
+LOCAL_MODULE_TAGS := optional
LOCAL_CPP_EXTENSION := .cc