Skip to content

P
protobuf
Commit 6ebe2303 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru
Browse files
Options

Make these modules optional. 

This allows compiling this code in Gingerbread.

Bug: 3064326

Change-Id: Idab78a5a31a3c2fc35bcdb773aaecf1e4fb70bcb
parent aa677643
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
Android.mk
View file @ 6ebe2303
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment