commit a6753f6dca47858efb8be26f5bd0921e5eab2aa7
author Jayant Chowdhary <jchowdhary@google.com> Thu Mar 29 23:03:38 2018 -0700
committer Jayant Chowdhary <jchowdhary@google.com> Mon Apr 02 17:29:27 2018 -0700
tree d3bed8a1fc409834e83e2d6f3b0d644c96eeec7d
parent ce4f4946384d43aedee5fc46667c70375d75f655

Make bootstub binary build with bootimg_headers.

Bug: 74763691

Test: N/A

Merged-In: Icdbf98ce86506b7d18e146b415a541c4b3b511ad
Change-Id: Icdbf98ce86506b7d18e146b415a541c4b3b511ad
(cherry picked from commit 689a2233923a705a48274172b394302469c45409)

bootstub.mk

diff --git a/bootstub.mk b/bootstub.mk
index fca23e6..0676c54 100644
--- a/bootstub.mk
+++ b/bootstub.mk
@@ -16,7 +16,7 @@
 LOCAL_CFLAGS := $(ANDROID_TOOLCHAIN_FLAGS) -Wall -O1 -DCMDLINE_SIZE=${CMDLINE_SIZE} -DAOSP_HEADER_ADDRESS=$(BOOTSTUB_AOSP_HEADER_ADDRESS) $(BOOTSTUB_CFLAGS)
 LOCAL_CFLAGS += -Werror
 LOCAL_ASFLAGS := -DSTACK_OFFSET=$(BOOTSTUB_STACK_OFFSET)
-LOCAL_C_INCLUDES = system/core/mkbootimg
+LOCAL_HEADER_LIBRARIES = bootimg_headers
 LOCAL_MODULE := $(BOOTSTUB_BINARY).bin
 LOCAL_MODULE_TAGS := optional
 LOCAL_MULTILIB := 32