aboutsummaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorWink Saville <wink@google.com>2013-08-07 21:00:39 -0700
committerWink Saville <wink@google.com>2013-08-07 21:00:39 -0700
commitd1229a35f127eb85391797f04aed1b9fe7da9fd8 (patch)
treee3a406f6dd155578e0a3f18699641b6e4abb9346 /Android.mk
parente7b778b99f607460ed9ea88a13ec91164cda8537 (diff)
downloadexternal_protobuf-d1229a35f127eb85391797f04aed1b9fe7da9fd8.zip
external_protobuf-d1229a35f127eb85391797f04aed1b9fe7da9fd8.tar.gz
external_protobuf-d1229a35f127eb85391797f04aed1b9fe7da9fd8.tar.bz2
Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto.
Change-Id: I2dad2fd9f6c3d419fa77cf8162cd1ee49f74cc5d
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index 259dabe..56419db 100644
--- a/Android.mk
+++ b/Android.mk
@@ -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