Merge changes from topic "libril_soong" into main am: 070d655caf
Original change: https://android-review.googlesource.com/c/platform/hardware/ril/+/3283403
Change-Id: I29eca0ba3718a4d5be4638e27559863207d15796
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/rild/Android.bp b/rild/Android.bp
new file mode 100644
index 0000000..8a14786
--- /dev/null
+++ b/rild/Android.bp
@@ -0,0 +1,66 @@
+// Copyright (C) 2006 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package {
+ // See: http://go/android-license-faq
+ default_applicable_licenses: [
+ "hardware_ril_rild_license",
+ ],
+}
+
+license {
+ name: "hardware_ril_rild_license",
+ visibility: [":__subpackages__"],
+ license_kinds: [
+ "SPDX-license-identifier-Apache-2.0",
+ ],
+ license_text: [
+ "NOTICE",
+ ],
+}
+
+cc_binary {
+ name: "rild",
+ srcs: ["rild.c"],
+
+ shared_libs: [
+ "libcutils",
+ "libdl",
+ "liblog",
+ "libril",
+ ],
+
+ // Temporary hack for broken vendor RILs.
+ whole_static_libs: ["librilutils"],
+ cflags: [
+ "-DRIL_SHLIB",
+ "-Wall",
+ "-Wextra",
+ "-Werror",
+ "-DPRODUCT_COMPATIBLE_PROPERTY",
+ ] + select(soong_config_variable("ril", "sim_count"), {
+ "2": [
+ "-DANDROID_MULTI_SIM",
+ "-DANDROID_SIM_COUNT_2",
+ ],
+ default: [],
+ }),
+ relative_install_path: "hw",
+ proprietary: true,
+ init_rc: ["rild.rc"],
+ enabled: select(soong_config_variable("ril", "use_aosp_rild"), {
+ true: true,
+ default: false,
+ }),
+}
diff --git a/rild/Android.mk b/rild/Android.mk
deleted file mode 100644
index d1c1b95..0000000
--- a/rild/Android.mk
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2006 The Android Open Source Project
-
-ifndef ENABLE_VENDOR_RIL_SERVICE
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES:= \
- rild.c
-
-LOCAL_SHARED_LIBRARIES := \
- libcutils \
- libdl \
- liblog \
- libril
-
-# Temporary hack for broken vendor RILs.
-LOCAL_WHOLE_STATIC_LIBRARIES := \
- librilutils
-
-LOCAL_CFLAGS := -DRIL_SHLIB
-LOCAL_CFLAGS += -Wall -Wextra -Werror
-
-ifeq ($(SIM_COUNT), 2)
- LOCAL_CFLAGS += -DANDROID_MULTI_SIM
- LOCAL_CFLAGS += -DANDROID_SIM_COUNT_2
-endif
-
-LOCAL_MODULE_RELATIVE_PATH := hw
-LOCAL_PROPRIETARY_MODULE := true
-LOCAL_MODULE:= rild
-LOCAL_LICENSE_KINDS:= SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS:= notice
-LOCAL_NOTICE_FILE:= $(LOCAL_PATH)/NOTICE
-ifeq ($(PRODUCT_COMPATIBLE_PROPERTY),true)
-LOCAL_INIT_RC := rild.rc
-LOCAL_CFLAGS += -DPRODUCT_COMPATIBLE_PROPERTY
-else
-LOCAL_INIT_RC := rild.legacy.rc
-endif
-
-include $(BUILD_EXECUTABLE)
-
-endif
