Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0132fb7f authored by Dan Willemsen's avatar Dan Willemsen Committed by Gerrit Code Review
Browse files

Merge "Revert "Move some prebuilt build tool configs to Soong""

parents 925d6369 51c49e59

core/config.mk

+10 −2
Original line number Diff line number Diff line
@@ -587,8 +587,16 @@ SOONG_ZIP := $(SOONG_HOST_OUT_EXECUTABLES)/soong_zip 
# ---------------------------------------------------------------

# Generic tools.



# These dependencies are now handled via dependencies on prebuilt_build_tool

BISON_DATA :=$=

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



YASM := prebuilts/misc/$(BUILD_OS)-$(HOST_PREBUILT_ARCH)/yasm/yasm

core/main.mk

+0 −2
Original line number Diff line number Diff line
@@ -33,8 +33,6 @@ 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