commit 529113098350c026ec521258d4c6fba51f285a48
author Ying Wang <wangying@google.com> Wed May 26 13:13:56 2010 -0700
committer Ying Wang <wangying@google.com> Wed May 26 13:39:31 2010 -0700
tree bec1876c0af8a3500c0843aae7cf6dd8245be4da
parent 8e5605a774fd2f61c6d5bae0440b20fc0bdd79f7

Cherry-pick unbundled build changes from master

Change-Id: I82cab32f00b7b729d9b01c8e1532c8bf0ad2fb92

core/base_rules.mk

diff --git a/core/base_rules.mk b/core/base_rules.mk
index 0ad797a..f0cbdca 100644
--- a/core/base_rules.mk
+++ b/core/base_rules.mk
@@ -235,7 +235,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 #########################################