tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Move some prebuilt build tool configs to Soong" am: 925d63690c

Browse source 
Original change: https://android-review.googlesource.com/c/platform/build/+/1366356

Change-Id: Ib296dd4dbd92085977e357a22365543b9a2e3bed
This commit is contained in:
Dan Willemsen 2020-07-23 21:25:10 +00:00 committed by Automerger Merge Worker
commit 9b6377949b
2 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
core/config.mk
View file

@ -587,16 +587,8 @@ SOONG_ZIP := $(SOONG_HOST_OUT_EXECUTABLES)/soong_zip
# ---------------------------------------------------------------
# Generic tools.
LEX := $(prebuilt_build_tools_bin_noasan)/flex
# The default PKGDATADIR built in the prebuilt bison is a relative path
# prebuilts/build-tools/common/bison.
# To run bison from elsewhere you need to set up enviromental variable
# BISON_PKGDATADIR.
BISON_PKGDATADIR := $(prebuilt_build_tools)/common/bison
BISON := $(prebuilt_build_tools_bin_noasan)/bison
YACC := $(BISON) -d
BISON_DATA := $(wildcard $(BISON_PKGDATADIR)/* $(BISON_PKGDATADIR)/*/*)
M4 :=$= $(prebuilt_build_tools_bin_noasan)/m4
# These dependencies are now handled via dependencies on prebuilt_build_tool
BISON_DATA :=$=
YASM := prebuilts/misc/$(BUILD_OS)-$(HOST_PREBUILT_ARCH)/yasm/yasm

2
core/main.mk
View file

@ -33,6 +33,8 @@ endif
include $(SOONG_MAKEVARS_MK)
YACC :=$= $(BISON) -d
include $(BUILD_SYSTEM)/clang/config.mk
# Write the build number to a file so it can be read back in