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

Commit 06af80f6 authored by Shinichiro Hamaji's avatar Shinichiro Hamaji Committed by android-build-merger
Browse files

Merge "Add Bison binary and its data to prerequisite" 

am: 4d69fbf5

* commit '4d69fbf5':
  Add Bison binary and its data to prerequisite

Change-Id: I5ee7077db82707a4aaa5c7801e8dbc0b564316bb
parents ae917433 4d69fbf5

core/binary.mk

+2 −2
Original line number Diff line number Diff line
@@ -811,7 +811,7 @@ y_yacc_cs := $(addprefix \ 
    $(intermediates)/,$(y_yacc_sources:.y=.c))

ifneq ($(y_yacc_cs),)

$(y_yacc_cs): $(intermediates)/%.c: \

    $(TOPDIR)$(LOCAL_PATH)/%.y \

    $(TOPDIR)$(LOCAL_PATH)/%.y $(BISON) $(BISON_DATA) \

    $(my_additional_dependencies)

	$(call transform-y-to-c-or-cpp)

$(call track-src-file-gen,$(y_yacc_sources),$(y_yacc_cs))
@@ -824,7 +824,7 @@ yy_yacc_cpps := $(addprefix \ 
    $(intermediates)/,$(yy_yacc_sources:.yy=$(LOCAL_CPP_EXTENSION)))

ifneq ($(yy_yacc_cpps),)

$(yy_yacc_cpps): $(intermediates)/%$(LOCAL_CPP_EXTENSION): \

    $(TOPDIR)$(LOCAL_PATH)/%.yy \

    $(TOPDIR)$(LOCAL_PATH)/%.yy $(BISON) $(BISON_DATA) \

    $(my_additional_dependencies)

	$(call transform-y-to-c-or-cpp)

$(call track-src-file-gen,$(yy_yacc_sources),$(yy_yacc_cpps))

core/config.mk

+1 −0
Original line number Diff line number Diff line
@@ -500,6 +500,7 @@ LEX := prebuilts/misc/$(BUILD_OS)-$(HOST_PREBUILT_ARCH)/flex/flex-2.5.39 
BISON_PKGDATADIR := $(PWD)/external/bison/data

BISON := prebuilts/misc/$(BUILD_OS)-$(HOST_PREBUILT_ARCH)/bison/bison

YACC := $(BISON) -d

BISON_DATA := $(wildcard external/bison/data/* external/bison/data/*/*)



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