diff options
| author | Ulas Kirazci <ulas@google.com> | 2013-07-26 19:22:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-07-26 19:22:49 +0000 |
| commit | 021f8f1badf1c4db519e3f35d600dec4b5c52eff (patch) | |
| tree | d9f665bbec335559dc7ef6454c43fc4fa238f43b | |
| parent | ac5a239e7d90613cb9404098b70c036a52531a74 (diff) | |
| parent | 7e567b8b0a9e1155666752723ca835734d60ab92 (diff) | |
| download | external_protobuf-021f8f1badf1c4db519e3f35d600dec4b5c52eff.zip external_protobuf-021f8f1badf1c4db519e3f35d600dec4b5c52eff.tar.gz external_protobuf-021f8f1badf1c4db519e3f35d600dec4b5c52eff.tar.bz2 | |
Merge "Add test for passing in proto params."
| -rw-r--r-- | Android.mk | 23 | ||||
| -rw-r--r-- | java/README.txt | 3 |
2 files changed, 25 insertions, 1 deletions
@@ -350,3 +350,26 @@ LOCAL_STATIC_LIBRARIES += libz LOCAL_LDLIBS := -lpthread include $(BUILD_HOST_EXECUTABLE) + +# To test java proto params build rules. +# ======================================================= +include $(CLEAR_VARS) + +LOCAL_MODULE := aprotoc-test-nano-params +LOCAL_MODULE_TAGS := tests +LOCAL_SDK_VERSION := current + +LOCAL_PROTOC_OPTIMIZE_TYPE := nano + +LOCAL_SRC_FILES := \ + src/google/protobuf/unittest_import_nano.proto \ + src/google/protobuf/unittest_simple_nano.proto \ + src/google/protobuf/unittest_stringutf8_nano.proto \ + src/google/protobuf/unittest_recursive_nano.proto \ + src/google/protobuf/unittest_enum_multiplejava_nano.proto + +LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)/src + +LOCAL_PROTO_JAVA_OUTPUT_PARAMS := java_package=$(LOCAL_PATH)/src/google/protobuf/unittest_import_nano.proto|com.google.protobuf.nano,java_outer_classname=$(LOCAL_PATH)/src/google/protobuf/unittest_import_nano.proto|UnittestImportNano + +include $(BUILD_STATIC_JAVA_LIBRARY) diff --git a/java/README.txt b/java/README.txt index 8ebc9fb..dac2e3c 100644 --- a/java/README.txt +++ b/java/README.txt @@ -324,7 +324,8 @@ Please run the following steps to test: - cd ../../.. - . build/envsetup.sh - lunch 1 -- "make -j12 aprotoc libprotobuf-java-2.3.0-nano" and check for build errors. +- "make -j12 aprotoc libprotobuf-java-2.3.0-nano aprotoc-test-nano-params" and + check for build errors. - repo sync -c -j256 - "make -j12" and check for build errors |