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

Commit b62d6bb5 authored by Dan Willemsen's avatar Dan Willemsen Committed by Automerger Merge Worker
Browse files

Merge "Reland "Move some prebuilt build tool configs to Soong"" am: 1a9ee405 

Original change: https://android-review.googlesource.com/c/platform/build/+/1393145

Change-Id: Ib3e632bf848c24bc53a877596c9a1f51fe350fbc
parents 02e56fc6 1a9ee405

core/config.mk

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