diff options
| author | Wink Saville <wink@google.com> | 2013-08-08 04:01:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-08-08 04:01:29 +0000 |
| commit | e43344398f43a69cda71e9ff725efd4b3cd82723 (patch) | |
| tree | 3b820d45d60676909879d563ac8ff5491f3f7f67 | |
| parent | 062d561e31212186740a94a9861a52658267c8d2 (diff) | |
| parent | 473985e07ef85aad2994f8955d67931eb666f64c (diff) | |
| download | protobuf-e43344398f43a69cda71e9ff725efd4b3cd82723.tar.gz protobuf-e43344398f43a69cda71e9ff725efd4b3cd82723.tar.bz2 protobuf-e43344398f43a69cda71e9ff725efd4b3cd82723.zip | |
Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."
| -rw-r--r-- | Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -365,8 +365,8 @@ 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 + src/google/protobuf/unittest_recursive_nano.proto + LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)/src |