--- /dev/null
+// Copyright 2013 The Android Open Source Project
+
+cc_library {
+ name: "librilutils",
+
+ srcs: [
+ "librilutils.c",
+ "record_stream.c",
+ "proto/sap-api.proto",
+ ],
+
+ header_libs: ["ril_headers"],
+ export_header_lib_headers: ["ril_headers"],
+
+ cflags: [
+ "-Wall",
+ "-Wextra",
+ "-Werror",
+ ],
+
+ proto: {
+ type: "nanopb-c-enable_malloc",
+ export_proto_headers: true,
+ },
+
+ vendor: true,
+}
+
+// Create java protobuf code
+java_library {
+ name: "sap-api-java-static",
+ srcs: ["proto/sap-api.proto"],
+ proto: {
+ type: "micro",
+ },
+}
+++ /dev/null
-# Copyright 2013 The Android Open Source Project
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES:= \
- librilutils.c \
- record_stream.c \
- proto/sap-api.proto \
-
-LOCAL_C_INCLUDES += \
- external/nanopb-c/ \
- $(LOCAL_PATH)/../include
-LOCAL_EXPORT_C_INCLUDE_DIRS := \
- $(LOCAL_PATH)/../include
-
-LOCAL_CFLAGS := -Wall -Wextra -Werror
-
-LOCAL_PROTOC_OPTIMIZE_TYPE := nanopb-c-enable_malloc
-
-LOCAL_MODULE:= librilutils
-LOCAL_VENDOR_MODULE:= true
-
-include $(BUILD_SHARED_LIBRARY)
-
-
-# Create static library for those that want it
-# =========================================
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES:= \
- librilutils.c \
- record_stream.c \
- proto/sap-api.proto \
-
-LOCAL_C_INCLUDES += \
- external/nanopb-c/ \
- $(LOCAL_PATH)/../include
-LOCAL_EXPORT_C_INCLUDE_DIRS := \
- $(LOCAL_PATH)/../include
-
-LOCAL_CFLAGS := -Wall -Wextra -Werror
-
-LOCAL_PROTOC_OPTIMIZE_TYPE := nanopb-c-enable_malloc
-
-LOCAL_MODULE:= librilutils_static
-LOCAL_VENDOR_MODULE:= true
-
-include $(BUILD_STATIC_LIBRARY)
-
-# Create java protobuf code
-
-include $(CLEAR_VARS)
-
-src_proto := $(LOCAL_PATH)
-LOCAL_MODULE := sap-api-java-static
-LOCAL_SRC_FILES := proto/sap-api.proto
-LOCAL_CFLAGS := -Wall -Wextra -Werror
-LOCAL_PROTOC_OPTIMIZE_TYPE := micro
-
-include $(BUILD_STATIC_JAVA_LIBRARY)