diff options
| author | Ying Wang <wangying@google.com> | 2010-11-05 11:20:03 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2010-11-05 11:20:03 -0700 |
| commit | 60293914c19681fcb6c933d53561f40af032bbda (patch) | |
| tree | 82edc89d6bec8ec06f41d288ef2e116f26ff7234 /core/base_rules.mk | |
| parent | 3d6bf975bd105b397956f9009ca6b7e5e5f2711d (diff) | |
| download | build-60293914c19681fcb6c933d53561f40af032bbda.zip build-60293914c19681fcb6c933d53561f40af032bbda.tar.gz build-60293914c19681fcb6c933d53561f40af032bbda.tar.bz2 | |
Set the correct proto intermediate dir for native modules.
Change-Id: I008778de2b81ed0c029979a7865827a96bf44b51
Diffstat (limited to 'core/base_rules.mk')
| -rw-r--r-- | core/base_rules.mk | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/core/base_rules.mk b/core/base_rules.mk index 2dae399..132632b 100644 --- a/core/base_rules.mk +++ b/core/base_rules.mk @@ -273,7 +273,12 @@ ifneq ($(proto_sources),) proto_sources_fullpath := $(addprefix $(TOP_DIR)$(LOCAL_PATH)/, $(proto_sources)) # By putting the generated java files into $(LOCAL_INTERMEDIATE_SOURCE_DIR), they will be # automatically found by the java compiling function transform-java-to-classes.jar. +ifneq ($(LOCAL_INTERMEDIATE_SOURCE_DIR),) proto_java_intemediate_dir := $(LOCAL_INTERMEDIATE_SOURCE_DIR)/proto +else +# LOCAL_INTERMEDIATE_SOURCE_DIR may be not defined in non-java modules. +proto_java_intemediate_dir := $(intermediates)/proto +endif proto_java_sources_file_stamp := $(proto_java_intemediate_dir)/Proto.stamp proto_java_sources_dir := $(proto_java_intemediate_dir)/src |