Convert libplatfomprotos to Android.bp

See build/soong/README.md for more information.

Test: m -j checkbuild
Change-Id: I0b45697d1042cb1647f2609b2257444dede84d2a
This commit is contained in:
Colin Cross 2017-05-02 14:14:56 -07:00
parent 66319381e1
commit aa0d4355d7
2 changed files with 38 additions and 29 deletions

View File

@ -12,6 +12,44 @@
// See the License for the specific language governing permissions and
// limitations under the License.
// ==== c++ proto device library ==============================
cc_library {
name: "libplatformprotos",
host_supported: true,
// b/34740546, work around clang-tidy segmentation fault.
tidy_checks: ["-modernize*"],
proto: {
export_proto_headers: true,
include_dirs: ["external/protobuf/src"],
},
target: {
host: {
proto: {
type: "full",
},
},
android: {
proto: {
type: "lite",
},
shared: {
// The proto files generate full protos, but we only use
// them as lite on device. This works fine for a static
// library, where the unused full symbols are stripped,
// but fails if it is linked as a standalone shared
// library because it is missing the full runtime.
enabled: false,
},
},
},
srcs: [
"core/proto/**/*.proto",
"libs/incident/**/*.proto",
],
}
subdirs = [
"libs/*",
"tools/*",

View File

@ -1477,35 +1477,6 @@ endif
include $(BUILD_JAVA_LIBRARY)
# ==== c++ proto device library ==============================
include $(CLEAR_VARS)
LOCAL_MODULE := libplatformprotos
# b/34740546, work around clang-tidy segmentation fault.
LOCAL_TIDY_CHECKS := -modernize*
LOCAL_PROTOC_OPTIMIZE_TYPE := lite
LOCAL_PROTOC_FLAGS := \
--include_source_info \
-Iexternal/protobuf/src
LOCAL_SRC_FILES := \
$(call all-proto-files-under, core/proto) \
$(call all-proto-files-under, libs/incident/proto)
include $(BUILD_STATIC_LIBRARY)
# ==== c++ proto host library ==============================
include $(CLEAR_VARS)
LOCAL_MODULE := libplatformprotos
# b/34740546, work around clang-tidy segmentation fault.
LOCAL_TIDY_CHECKS := -modernize*
LOCAL_PROTOC_OPTIMIZE_TYPE := full
LOCAL_PROTOC_FLAGS := \
--include_source_info \
-Iexternal/protobuf/src
LOCAL_SRC_FILES := \
$(call all-proto-files-under, core/proto) \
$(call all-proto-files-under, libs/incident/proto)
include $(BUILD_HOST_SHARED_LIBRARY)
# ==== java proto host library ==============================
include $(CLEAR_VARS)
LOCAL_MODULE := platformprotos