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

Commit a46d9778 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix libplatformproto includes/export includes"

parents 9e284db8 349907c1

Android.mk

+0 −8
Original line number Diff line number Diff line
@@ -1453,10 +1453,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  ==============================
@@ -1471,10 +1467,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)