diff options
| author | Yongqin Liu <yongqin.liu@linaro.org> | 2017-04-24 16:25:24 +0800 |
|---|---|---|
| committer | Yongqin Liu <yongqin.liu@linaro.org> | 2017-04-24 09:41:53 +0100 |
| commit | cfac742a97f7ef1e141fce1839a0a9535227fae2 (patch) | |
| tree | f6ad297ee88534abb135180a1cf05daf92f52123 | |
| parent | 8db217badc22e7c55bfd5379316ed2b7fb8afff4 (diff) | |
| download | waffle-cfac742a97f7ef1e141fce1839a0a9535227fae2.tar.gz | |
Android.mk: fix compiling error with masterRLCR-17.05
with aosp master, the PLATFORM_VERSION is set to string like O,
instead of value 7.1.2
Change-Id: I34a845257443533ca6bbd3d83dee46558aad5c80
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
| -rw-r--r-- | .gitreview | 5 | ||||
| -rw-r--r-- | Android.mk | 8 |
2 files changed, 13 insertions, 0 deletions
diff --git a/.gitreview b/.gitreview new file mode 100644 index 0000000..b86f3da --- /dev/null +++ b/.gitreview @@ -0,0 +1,5 @@ +[gerrit] +host=android-review.linaro.org +port=29418 +project=platform/external/waffle +defaultbranch=linaro-armv8 @@ -14,6 +14,14 @@ waffle_api_version := 0x0104 waffle_android_major_version := $(word 1, $(subst ., , $(PLATFORM_VERSION))) waffle_android_minor_version := $(word 2, $(subst ., , $(PLATFORM_VERSION))) +ifneq ($(filter O P Q R S T U V W X Y Z,$(waffle_android_major_version)),) +waffle_android_major_version := 8 +endif + +ifeq ($(waffle_android_minor_version),) +waffle_android_minor_version := 0 +endif + $(waffle_top)/include/waffle/waffle_version.h: \ $(waffle_top)/Android.mk \ $(waffle_top)/include/waffle/waffle_version.h.in |