commit d15b6972bfc4709b26969198b9d351e21b6ec157
author Ying Wang <wangying@google.com> Fri May 14 16:40:44 2010 -0700
committer Ying Wang <wangying@google.com> Mon May 17 14:55:00 2010 -0700
tree 86220f30057cececd05620ab68324095333161b7
parent 07c5e16d883ad43314ff6da9b31eac05087973c0

Allow java source in LOCAL_GENERATED_SOURCE

Change-Id: I82f426f1523f56a87ad396f2d7928b839f7c3ec9

core/base_rules.mk

diff --git a/core/base_rules.mk b/core/base_rules.mk
index 6d80c49..eda08bc 100644
--- a/core/base_rules.mk
+++ b/core/base_rules.mk
@@ -237,7 +237,8 @@
 ###########################################################
 #TODO: pull this into java.make once host and target are combined
 
-java_sources := $(addprefix $(TOP_DIR)$(LOCAL_PATH)/, $(filter %.java,$(LOCAL_SRC_FILES))) $(aidl_java_sources) $(logtags_java_sources)
+java_sources := $(addprefix $(TOP_DIR)$(LOCAL_PATH)/, $(filter %.java,$(LOCAL_SRC_FILES))) $(aidl_java_sources) $(logtags_java_sources) \
+                $(filter %.java,$(LOCAL_GENERATED_SOURCES))
 all_java_sources := $(java_sources) $(addprefix $($(my_prefix)OUT_COMMON_INTERMEDIATES)/, $(filter %.java,$(LOCAL_INTERMEDIATE_SOURCES)))
 
 ## Java resources #########################################