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

Commit fd72f7f3 authored by Dan Willemsen's avatar Dan Willemsen
Browse files

Reland "Move some prebuilt build tool configs to Soong" 

Now that they're defined with prebuilt_build_tool, we don't need to set
them here.

In future changes we can replace more of these definitions with
prebuilt_build_tool, as it can centralize the selection of
build-from-source or prebuilt for Make, Soong, and user-defined
genrules.

Test: treehugger
Change-Id: I5821bbad1b655d561919245320d7c184a6eac737
parent e9bceb66

core/config.mk

+2 −10
Original line number Diff line number Diff line
@@ -588,16 +588,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

core/main.mk

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