Merge "Fix libplatformproto includes/export includes"
This commit is contained in:
committed by
Android (Google) Code Review
commit
a46d977849
@@ -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)
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user