StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Pass USE_SAFESTACK to Soong."

Browse Source 
am: 00bccf54d4

* commit '00bccf54d4b3847cf54f6507c8fa29eabf26f2e7':
  Pass USE_SAFESTACK to Soong.

Change-Id: I9258135b2debee97b21de27232a7530780a63f5d
This commit is contained in:
Evgenii Stepanov
2016-05-13 22:33:47 +00:00
committed by android-build-merger
parent f87e3bb296 00bccf54d4
commit 5bd91e69f7
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/soong.mk
View File

@@ -65,7 +65,8 @@ $(SOONG_VARIABLES): FORCE
echo ''; \ echo ''; \
echo ' "CrossHost": "$(HOST_CROSS_OS)",'; \ echo ' "CrossHost": "$(HOST_CROSS_OS)",'; \
echo ' "CrossHostArch": "$(HOST_CROSS_ARCH)",'; \ echo ' "CrossHostArch": "$(HOST_CROSS_ARCH)",'; \
echo ' "CrossHostSecondaryArch": "$(HOST_CROSS_2ND_ARCH)"'; \ echo ' "CrossHostSecondaryArch": "$(HOST_CROSS_2ND_ARCH)",'; \
echo ' "Safestack": $(if $(filter true,$(USE_SAFESTACK)),true,false)'; \
echo '}') > $(SOONG_VARIABLES_TMP); \ echo '}') > $(SOONG_VARIABLES_TMP); \
if ! cmp -s $(SOONG_VARIABLES_TMP) $(SOONG_VARIABLES); then \ if ! cmp -s $(SOONG_VARIABLES_TMP) $(SOONG_VARIABLES); then \
mv $(SOONG_VARIABLES_TMP) $(SOONG_VARIABLES); \ mv $(SOONG_VARIABLES_TMP) $(SOONG_VARIABLES); \