From: Mauro Rossi <issor.oruam@gmail.com>
Date: Sat, 14 Jan 2017 13:58:55 +0000 (+0100)
Subject: Use shell-script $$(...) instead of $(shell ...)
X-Git-Tag: android-x86-6.0-r3~6
X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fbootable-newinstaller.git;a=commitdiff_plain;h=03fa0d8a8349309ae7998e7b2907a06b9e467c4a

Use shell-script $$(...) instead of $(shell ...)

kati doesn't support passing results of $(shell)
to other make constructs, as explained here:
https://github.com/google/kati/issues/71

Fixes the following building error in nougat-x86:

./bootable/newinstaller/Android.mk:82: kati doesn't support passing
results of $(shell) to other make constructs: date +"%F"
build/core/ninja.mk:163: recipe for target
'out/build-android_x86_64.ninja' failed
make: *** [out/build-android_x86_64.ninja] Error 1
---

diff --git a/Android.mk b/Android.mk
index 8033c6a..74aea9a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -23,7 +23,7 @@ LOCAL_STATIC_LIBRARIES := libdiskconfig_host libcutils liblog
 edit_mbr := $(HOST_OUT_EXECUTABLES)/$(LOCAL_MODULE)
 include $(BUILD_HOST_EXECUTABLE)
 
-VER ?= $(shell date +"%F")
+VER ?= $$(date +"%F")
 
 # use squashfs for iso, unless explictly disabled
 ifneq ($(USE_SQUASHFS),0)