diff options
| author | Tom Gall <tom.gall@linaro.org> | 2013-06-06 11:27:44 -0500 |
|---|---|---|
| committer | Tom Gall <tom.gall@linaro.org> | 2013-06-06 11:27:44 -0500 |
| commit | 08aff1fce83ddcd3622e3e47bfe4187976497929 (patch) | |
| tree | ed986dfba4618bbaaa362841f2a510fcad171bd4 | |
| parent | c42522c76a94e82907b218c7670c89a8f92f952c (diff) | |
Fix waffle_version.h is properly generated as part of a normalandroid
android build when waffle is a dep of piglit.
| -rw-r--r-- | Android.mk | 13 |
1 files changed, 5 insertions, 8 deletions
@@ -13,15 +13,15 @@ waffle_patch_version := 75 waffle_android_major_version := $(word 1, $(subst ., , $(PLATFORM_VERSION))) waffle_android_minor_version := $(word 2, $(subst ., , $(PLATFORM_VERSION))) -$(waffle_top)/include/waffle_version.h: \ - $(waffle_top)/Android.mk \ - $(waffle_top)/include/waffle/waffle_version.h.in +WAFFLE_VERSION_H := $(waffle_top)/include/waffle/waffle_version.h +$(WAFFLE_VERSION_H): $(waffle_top)/include/waffle/waffle_version.h.in @echo "target Gen: libwaffle <= $(waffle_top)/include/waffle/waffle_version.h" @sed -e 's/@waffle_major_version@/$(waffle_major_version)/' \ -e 's/@waffle_minor_version@/$(waffle_minor_version)/' \ -e 's/@waffle_patch_version@/$(waffle_patch_version)/' \ - $(waffle_top)/include/waffle/waffle_version.h.in \ - > $(waffle_top)/include/waffle/waffle_version.h + $(waffle_top)/include/waffle/waffle_version.h.in > $(waffle_top)/include/waffle/waffle_version.h + +LOCAL_GENERATED_SOURCES += $(WAFFLE_VERSION_H) LOCAL_MODULE_TAGS := eng LOCAL_MODULE := libwaffle-$(waffle_major_version) @@ -80,9 +80,6 @@ LOCAL_SHARED_LIBRARIES := \ libutils \ libgui \ -LOCAL_GENERATED_SOURCES := \ - $(LOCAL_PATH)/include/waffle_version.h - LOCAL_COPY_HEADERS := \ include/waffle/waffle.h \ include/waffle/waffle_gbm.h \ |