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 | 48ee66d295979372ed0234cefda42385daae8312 (patch) | |
| tree | 85bd4e479b70d7afffbbcf48645b44f6160d127c | |
| parent | a38aedb3fff651a4e1921162d88df3e1c75726b3 (diff) | |
| parent | ece98e5f6728a937c8d32d342f3b1b037a611f3e (diff) | |
| download | platform_external_protobuf-kitkat-release.tar.gz platform_external_protobuf-kitkat-release.tar.bz2 platform_external_protobuf-kitkat-release.zip | |
am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."android-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-cts-4.4_r4android-cts-4.4_r1android-4.4w_r1android-4.4_r1.2.0.1android-4.4_r1.2android-4.4_r1.1.0.1android-4.4_r1.1android-4.4_r1.0.1android-4.4_r1android-4.4_r0.9android-4.4_r0.8android-4.4_r0.7android-4.4.4_r2.0.1android-4.4.4_r2android-4.4.4_r1.0.1android-4.4.4_r1android-4.4.3_r1.1.0.1android-4.4.3_r1.1android-4.4.3_r1.0.1android-4.4.3_r1android-4.4.2_r2.0.1android-4.4.2_r2android-4.4.2_r1.0.1android-4.4.2_r1android-4.4.1_r1.0.1android-4.4.1_r1kitkat-wearkitkat-releasekitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-devkitkat-cts-releasekitkat-cts-dev
* commit 'ece98e5f6728a937c8d32d342f3b1b037a611f3e':
Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto.
| -rw-r--r-- | Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk index 259dabe57..56419dbb6 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 |