diff options
| author | Jeff Davidson <jpd@google.com> | 2014-04-25 22:11:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-04-25 22:11:04 +0000 |
| commit | 33a6680ab98977cd5b9b7b03f4875b9265cfec3b (patch) | |
| tree | 195940ae75bbcb5b64f644c5ecfc4074eef34486 /Android.mk | |
| parent | 829f6c014ce69d04593d30652c8acc2f7a793851 (diff) | |
| parent | 721ea491a8e3e9ea5a130965dc5761fc335c3e61 (diff) | |
| download | external_protobuf-33a6680ab98977cd5b9b7b03f4875b9265cfec3b.zip external_protobuf-33a6680ab98977cd5b9b7b03f4875b9265cfec3b.tar.gz external_protobuf-33a6680ab98977cd5b9b7b03f4875b9265cfec3b.tar.bz2 | |
Merge "Support generation of Parcelable nano messages."
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 61 |
1 files changed, 61 insertions, 0 deletions
@@ -142,6 +142,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_SDK_VERSION := 8 LOCAL_SRC_FILES := $(call all-java-files-under, java/src/main/java/com/google/protobuf/nano) +LOCAL_SRC_FILES += $(call all-java-files-under, java/src/device/main/java/com/google/protobuf/nano) include $(BUILD_STATIC_JAVA_LIBRARY) @@ -379,3 +380,63 @@ LOCAL_PROTO_JAVA_OUTPUT_PARAMS := \ java_outer_classname = $(LOCAL_PATH)/src/google/protobuf/unittest_import_nano.proto|UnittestImportNano include $(BUILD_STATIC_JAVA_LIBRARY) + +# To test Android-specific nanoproto features. +# ======================================================= +include $(CLEAR_VARS) + +# Parcelable messages +LOCAL_MODULE := android-nano-test-parcelable +LOCAL_MODULE_TAGS := tests +LOCAL_SDK_VERSION := current + +LOCAL_PROTOC_OPTIMIZE_TYPE := nano + +LOCAL_SRC_FILES := src/google/protobuf/unittest_simple_nano.proto + +LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)/src + +LOCAL_PROTO_JAVA_OUTPUT_PARAMS := \ + parcelable_messages = true + +include $(BUILD_STATIC_JAVA_LIBRARY) + +include $(CLEAR_VARS) + +# Parcelable and extendable messages +LOCAL_MODULE := android-nano-test-parcelable-extendable +LOCAL_MODULE_TAGS := tests +LOCAL_SDK_VERSION := current + +LOCAL_PROTOC_OPTIMIZE_TYPE := nano + +LOCAL_SRC_FILES := src/google/protobuf/unittest_extension_nano.proto + +LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)/src + +LOCAL_PROTO_JAVA_OUTPUT_PARAMS := \ + parcelable_messages = true, \ + store_unknown_fields = true + +include $(BUILD_STATIC_JAVA_LIBRARY) + +include $(CLEAR_VARS) + +# Test APK +LOCAL_PACKAGE_NAME := NanoAndroidTest + +LOCAL_SDK_VERSION := 8 + +LOCAL_MODULE_TAGS := tests + +LOCAL_SRC_FILES := $(call all-java-files-under, java/src/device/test/java/com/google/protobuf/nano) + +LOCAL_MANIFEST_FILE := java/src/device/test/AndroidManifest.xml + +LOCAL_STATIC_JAVA_LIBRARIES := libprotobuf-java-2.3.0-nano \ + android-nano-test-parcelable \ + android-nano-test-parcelable-extendable + +WITH_DEXPREOPT := false + +include $(BUILD_PACKAGE) |