diff options
| author | Wink Saville <wink@google.com> | 2013-04-01 18:02:06 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-01 18:02:06 -0700 |
| commit | 061604bdadd797a5371248c177e77c942c2c44f6 (patch) | |
| tree | 4efaec5ab4ca4b30000503f1da3b3aa16228ad35 /core/base_rules.mk | |
| parent | 6686497ba38eec4b1ec62fc40b25b111a3653643 (diff) | |
| parent | 0262d0f74725f8a165b20eeac323cdd8ca31df03 (diff) | |
| download | build-061604bdadd797a5371248c177e77c942c2c44f6.zip build-061604bdadd797a5371248c177e77c942c2c44f6.tar.gz build-061604bdadd797a5371248c177e77c942c2c44f6.tar.bz2 | |
am 0262d0f7: Merge "Add a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE."
* commit '0262d0f74725f8a165b20eeac323cdd8ca31df03':
Add a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE.
Diffstat (limited to 'core/base_rules.mk')
| -rw-r--r-- | core/base_rules.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/base_rules.mk b/core/base_rules.mk index d03050b..188c352 100644 --- a/core/base_rules.mk +++ b/core/base_rules.mk @@ -257,7 +257,11 @@ $(proto_java_sources_file_stamp): PRIVATE_PROTO_JAVA_OUTPUT_DIR := $(proto_java_ ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),micro) $(proto_java_sources_file_stamp): PRIVATE_PROTO_JAVA_OUTPUT_OPTION := --javamicro_out else + ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),nano) +$(proto_java_sources_file_stamp): PRIVATE_PROTO_JAVA_OUTPUT_OPTION := --javanano_out + else $(proto_java_sources_file_stamp): PRIVATE_PROTO_JAVA_OUTPUT_OPTION := --java_out + endif endif $(proto_java_sources_file_stamp): PRIVATE_PROTOC_FLAGS := $(LOCAL_PROTOC_FLAGS) $(proto_java_sources_file_stamp) : $(proto_sources_fullpath) $(PROTOC) |