diff options
author | Dan Willemsen <dwillemsen@google.com> | 2018-11-20 15:20:02 -0800 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-11-20 15:20:02 -0800 |
commit | 6320625d65466ddbe7dcb5f2373b925442526a09 (patch) | |
tree | 0e7931015dc6714ef9626989d80b0cc193cc66e0 | |
parent | 021ef37bc2e17aec1aed0c32ec4ccb7d9830792b (diff) | |
parent | 3630e372e27a53c7838cd22acbb4139bf24b51d9 (diff) | |
download | platform_hardware_ril-6320625d65466ddbe7dcb5f2373b925442526a09.tar.gz platform_hardware_ril-6320625d65466ddbe7dcb5f2373b925442526a09.tar.bz2 platform_hardware_ril-6320625d65466ddbe7dcb5f2373b925442526a09.zip |
Merge "Convert librilutils to Android.bp" am: 1dc06a8cfa
am: 3630e372e2
Change-Id: Icaa4f51a877af4926abf90a5179f60ac48008314
-rw-r--r-- | Android.bp | 5 | ||||
-rw-r--r-- | librilutils/Android.bp | 36 | ||||
-rw-r--r-- | librilutils/Android.mk | 61 | ||||
-rw-r--r-- | rild/Android.mk | 2 |
4 files changed, 42 insertions, 62 deletions
diff --git a/Android.bp b/Android.bp new file mode 100644 index 00000000..cffa3382 --- /dev/null +++ b/Android.bp @@ -0,0 +1,5 @@ +cc_library_headers { + name: "ril_headers", + vendor: true, + export_include_dirs: ["include"], +} diff --git a/librilutils/Android.bp b/librilutils/Android.bp new file mode 100644 index 00000000..91ef34e7 --- /dev/null +++ b/librilutils/Android.bp @@ -0,0 +1,36 @@ +// 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", + }, +} diff --git a/librilutils/Android.mk b/librilutils/Android.mk deleted file mode 100644 index 62873e96..00000000 --- a/librilutils/Android.mk +++ /dev/null @@ -1,61 +0,0 @@ -# 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) diff --git a/rild/Android.mk b/rild/Android.mk index cc513324..55f2a184 100644 --- a/rild/Android.mk +++ b/rild/Android.mk @@ -16,7 +16,7 @@ LOCAL_SHARED_LIBRARIES := \ # Temporary hack for broken vendor RILs. LOCAL_WHOLE_STATIC_LIBRARIES := \ - librilutils_static + librilutils LOCAL_CFLAGS := -DRIL_SHLIB LOCAL_CFLAGS += -Wall -Wextra -Werror |