Merge "Fix unused src tracking for generated .o files" am: 478913f88f

am: d02bb7bfc5

* commit 'd02bb7bfc51343ab88eb2e05157155673ddf8130':
  Fix unused src tracking for generated .o files
This commit is contained in:
Dan Willemsen 2016-02-05 18:20:34 +00:00 committed by android-build-merger
commit 6fca454c41

View file

@ -528,7 +528,7 @@ my_generated_sources := $(patsubst $(generated_sources_dir)/%,$(intermediates)/%
# Other files (like headers) are allowed in LOCAL_GENERATED_SOURCES,
# since other compiled sources may depend on them, and we set up
# the dependencies.
my_gen_src_files := $(filter %.c %$(LOCAL_CPP_EXTENSION) %.S %.s %.o,$(my_generated_sources))
my_gen_src_files := $(filter %.c %$(LOCAL_CPP_EXTENSION) %.S %.s,$(my_generated_sources))
ALL_GENERATED_SOURCES += $(my_generated_sources)