commit a7d9ca371e552c3aec62cab9de958c55d0dd2ea3
author Ying Wang <wangying@google.com> Wed Jul 13 14:29:33 2011 -0700
committer Ying Wang <wangying@google.com> Wed Jul 13 14:29:33 2011 -0700
tree 91c4eefb4e382b121b15ae1fc8b8acf99fc084be
parent 66fb48e840c8cb7e93f61071ee0de381dc4d76e5

Use the LOCAL_* as dependency.

PRIVATE_* should be used only in the build commands.

Change-Id: Ie1d8db7c78012a8615b893d3ef3be893da7466f4

core/base_rules.mk

diff --git a/core/base_rules.mk b/core/base_rules.mk
index 02b04d6..635a256 100644
--- a/core/base_rules.mk
+++ b/core/base_rules.mk
@@ -234,7 +234,7 @@
 endif # LOCAL_SDK_VERSION
 $(aidl_java_sources): PRIVATE_AIDL_FLAGS := -b $(addprefix -p,$(aidl_preprocess_import)) -I$(LOCAL_PATH) -I$(LOCAL_PATH)/src $(addprefix -I,$(LOCAL_AIDL_INCLUDES))
 
-$(aidl_java_sources): $(intermediates.COMMON)/src/%.java: $(TOPDIR)$(LOCAL_PATH)/%.aidl $(PRIVATE_ADDITIONAL_DEPENDENCIES) $(AIDL) $(aidl_preprocess_import)
+$(aidl_java_sources): $(intermediates.COMMON)/src/%.java: $(TOPDIR)$(LOCAL_PATH)/%.aidl $(LOCAL_ADDITIONAL_DEPENDENCIES) $(AIDL) $(aidl_preprocess_import)
 	$(transform-aidl-to-java)
 -include $(aidl_java_sources:%.java=%.P)
 

core/binary.mk

diff --git a/core/binary.mk b/core/binary.mk
index 0374e93..dadfd5e 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -380,7 +380,7 @@
 objc_objects := $(addprefix $(intermediates)/,$(objc_sources:.m=.o))
 
 ifneq ($(strip $(objc_objects)),)
-$(objc_objects): $(intermediates)/%.o: $(TOPDIR)$(LOCAL_PATH)/%.m $(yacc_cpps) $(proto_generated_headers) $(PRIVATE_ADDITIONAL_DEPENDENCIES)
+$(objc_objects): $(intermediates)/%.o: $(TOPDIR)$(LOCAL_PATH)/%.m $(yacc_cpps) $(proto_generated_headers) $(LOCAL_ADDITIONAL_DEPENDENCIES)
 	$(transform-$(PRIVATE_HOST)m-to-o)
 -include $(objc_objects:%.o=%.P)
 endif