commit d02bb7bfc51343ab88eb2e05157155673ddf8130
author Dan Willemsen <dwillemsen@google.com> Fri Feb 05 18:18:20 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Feb 05 18:18:20 2016 +0000
tree f56814189efd2b11902fe2519eb4ca1dd3d1f431
parent 3611f2f440944dadd74b36a235c41c7957a6963c
parent 478913f88fdafc61015e87129486e12ddeb7d184

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

* commit '478913f88fdafc61015e87129486e12ddeb7d184':
  Fix unused src tracking for generated .o files

core/binary.mk

diff --git a/core/binary.mk b/core/binary.mk
index f33f676..4f5ced5 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -526,7 +526,7 @@
 # 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)