commit 6e98d44ba07ebadae7bdcba58557a0ad3afac09e
author Jayant Chowdhary <jchowdhary@google.com> Thu Mar 29 20:46:04 2018 -0700
committer Tao Bao <tbao@google.com> Sat Mar 31 00:09:15 2018 -0700
tree cc32481c96f17a7a6d7ab4dff81938e06003cbb4
parent 3681ee81a3d4ea977f45a8213d054ee94ad4ab6f

Make bootctrl.default use LOCAL_HEADER_LIBS bootimg_headers.

Bug: 74763691

Test: make -j64

Change-Id: I55fb951eea449c27aa0a4a5e9ab1a4dca09dbfa5
(cherry picked from commit 41afebb109a6f4b444c43622daa9707820eef6ef)

boot_control_copy/Android.mk

diff --git a/boot_control_copy/Android.mk b/boot_control_copy/Android.mk
index c90fd7c..93f1706 100644
--- a/boot_control_copy/Android.mk
+++ b/boot_control_copy/Android.mk
@@ -5,7 +5,8 @@
 
 LOCAL_SRC_FILES := boot_control_copy.cpp bootinfo.cpp
 LOCAL_CFLAGS := -Wall -Werror -Wno-missing-field-initializers -Wno-unused-parameter
-LOCAL_C_INCLUDES := system/core/mkbootimg bootable/recovery
+LOCAL_C_INCLUDES := bootable/recovery
+LOCAL_HEADER_LIBRARIES := bootimg_headers
 LOCAL_SHARED_LIBRARIES := libbase libcutils
 LOCAL_STATIC_LIBRARIES := libfs_mgr