diff options
| author | Wink Saville <wink@google.com> | 2013-08-08 16:21:35 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-08-08 16:21:35 -0700 |
| commit | 171633db946cb91703575a54809696d15323083e (patch) | |
| tree | 3b820d45d60676909879d563ac8ff5491f3f7f67 | |
| parent | c1c1e417c0f3debdc5b64f678d304125a06dba34 (diff) | |
| parent | e43344398f43a69cda71e9ff725efd4b3cd82723 (diff) | |
| download | protobuf-171633db946cb91703575a54809696d15323083e.tar.gz protobuf-171633db946cb91703575a54809696d15323083e.tar.bz2 protobuf-171633db946cb91703575a54809696d15323083e.zip | |
am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."
* commit 'ece98e5f6728a937c8d32d342f3b1b037a611f3e':
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 |