diff options
author | Colin Cross <ccross@android.com> | 2016-07-27 16:28:05 -0700 |
---|---|---|
committer | Dan Willemsen <dwillemsen@google.com> | 2016-09-02 11:15:24 -0700 |
commit | 581669db5974cdcb477d088bf74b73c11b3bc007 (patch) | |
tree | e873a1dde00e692b6b14b146fc263aba5490d264 | |
parent | 9b683e1fb65325a32b0a7fe11ea280fa5a1e8eda (diff) | |
download | libva-581669db5974cdcb477d088bf74b73c11b3bc007.tar.gz |
In make, appending to a non-existant variable using += results in
delayed evalution of the RHS. If another Android.mk file assigns to GEN
between this one and when ALL_COPIED_HEADERS is evaluated, it will see
the new value of GEN.
Replace += with :=.
Change-Id: I77400bf7eed788cae89dcd9fd690717db4780f39
(cherry picked from commit d07e32b114801d8631696fd7e88649b5e36ccae5)
-rwxr-xr-x | va/Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
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 @@ LOCAL_GENERATED_SOURCES := $(GEN) 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 |