commit f5d5070e5aefc7dced60e128e218f22900b1ea05
author android-build-team Robot <android-build-team-robot@google.com> Wed Apr 04 07:23:37 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed Apr 04 07:23:37 2018 +0000
tree d3bed8a1fc409834e83e2d6f3b0d644c96eeec7d
parent a10d31737650bb38baff000daf67307466f50954
parent a6753f6dca47858efb8be26f5bd0921e5eab2aa7

Snap for 4698807 from a6753f6dca47858efb8be26f5bd0921e5eab2aa7 to pi-release

Change-Id: Ie49e8b4cb1a3526c9d871a5f6b8e4056f8f8b5fb

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