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 | ece98e5f6728a937c8d32d342f3b1b037a611f3e (patch) | |
| tree | e3a406f6dd155578e0a3f18699641b6e4abb9346 | |
| parent | e7b778b99f607460ed9ea88a13ec91164cda8537 (diff) | |
| parent | d1229a35f127eb85391797f04aed1b9fe7da9fd8 (diff) | |
| download | external_protobuf-ece98e5f6728a937c8d32d342f3b1b037a611f3e.zip external_protobuf-ece98e5f6728a937c8d32d342f3b1b037a611f3e.tar.gz external_protobuf-ece98e5f6728a937c8d32d342f3b1b037a611f3e.tar.bz2 | |
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 |