commit 68cf833908727191141763e56eb8e2a1115fb41d
author Colin Cross <ccross@android.com> Sat Sep 03 03:11:02 2016 +0000
committer android-build-merger <android-build-merger@google.com> Sat Sep 03 03:11:02 2016 +0000
tree e873a1dde00e692b6b14b146fc263aba5490d264
parent 9b683e1fb65325a32b0a7fe11ea280fa5a1e8eda
parent 2eaea8d70310ca651b3fdd52dbcb9d98b8c6bd4d

Fix build am: 581669db59
am: 2eaea8d703

Change-Id: I5525003c2e7fc088516e51f636b45f1edabc445e

va/Android.mk

diff --git a/va/Android.mk b/va/Android.mk
index 8012005..0ea46c7 100755
--- a/va/Android.mk
+++ b/va/Android.mk
@@ -91,8 +91,8 @@
 include $(BUILD_SHARED_LIBRARY)
 
 my_header := $(TARGET_OUT_HEADERS)/libva/va/va_version.h
-ALL_COPIED_HEADERS.$(my_header).MAKEFILE += $(my_header)
-ALL_COPIED_HEADERS.$(my_header).SRC += $(GEN)
+ALL_COPIED_HEADERS.$(my_header).MAKEFILE := $(ALL_COPIED_HEADERS.$(my_header).MAKEFILE) $(my_header)
+ALL_COPIED_HEADERS.$(my_header).SRC := $(ALL_COPIED_HEADERS.$(my_header).SRC) $(GEN)
 ALL_COPIED_HEADERS += $(my_header)
 
 # For libva-android