From 349907c1ad592b172f2cc6faf52250932c9be620 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Fri, 17 Mar 2017 13:05:20 -0700 Subject: [PATCH] Fix libplatformproto includes/export includes The host versions of these were pointing to the target generated sources, without having proper dependencies added. But the build system already handles these adding these to your local and exported include directories, so just remove them. Bug: 36365556 Test: m -j libhwui incident_report incident-section-gen Change-Id: I52024508eabd8d10899c307c950fe045ff66ab25 --- Android.mk | 8 -------- 1 file changed, 8 deletions(-) diff --git a/Android.mk b/Android.mk index 0e5dfed536075..84f066f7e80b8 100644 --- a/Android.mk +++ b/Android.mk @@ -1472,10 +1472,6 @@ LOCAL_PROTOC_FLAGS := \ LOCAL_SRC_FILES := \ $(call all-proto-files-under, core/proto) \ $(call all-proto-files-under, libs/incident/proto) -LOCAL_C_INCLUDES := \ - $(call generated-sources-dir-for,STATIC_LIBRARIES,libplatformprotos,)/proto -LOCAL_EXPORT_C_INCLUDES := \ - $(call generated-sources-dir-for,STATIC_LIBRARIES,libplatformprotos,)/proto include $(BUILD_STATIC_LIBRARY) # ==== c++ proto host library ============================== @@ -1490,10 +1486,6 @@ LOCAL_PROTOC_FLAGS := \ LOCAL_SRC_FILES := \ $(call all-proto-files-under, core/proto) \ $(call all-proto-files-under, libs/incident/proto) -LOCAL_C_INCLUDES := \ - $(call generated-sources-dir-for,STATIC_LIBRARIES,libplatformprotos,)/proto -LOCAL_EXPORT_C_INCLUDES := \ - $(call generated-sources-dir-for,STATIC_LIBRARIES,libplatformprotos,)/proto include $(BUILD_HOST_SHARED_LIBRARY)