diff options
| author | Lalit Kansara <lkansara@codeaurora.org> | 2018-03-12 19:44:12 +0530 |
|---|---|---|
| committer | Lalit Kansara <lkansara@codeaurora.org> | 2018-03-14 13:59:56 +0530 |
| commit | dfa81fff1f5de98a19c3069a0b6fe230f4008e02 (patch) | |
| tree | f473b6472d23838fdc6c6d93a12a49a9f45151ba /rild | |
| parent | 1f6a51cd7c680987a533de0c4cf3f04fc0d19be9 (diff) | |
| parent | efa6e614ef66851e2491a18485529ae2bd869201 (diff) | |
| download | android_hardware_ril-dfa81fff1f5de98a19c3069a0b6fe230f4008e02.tar.gz android_hardware_ril-dfa81fff1f5de98a19c3069a0b6fe230f4008e02.tar.bz2 android_hardware_ril-dfa81fff1f5de98a19c3069a0b6fe230f4008e02.zip | |
P PPR1.180311.001 merge efa6e614ef66851e2491a18485529ae2bd869201 - conflicts
Change-Id: Ic355831b6ed1119238f0ea9c4cd7387408f48cc3
Diffstat (limited to 'rild')
| -rw-r--r-- | rild/Android.mk | 7 | ||||
| -rw-r--r-- | rild/rild.c | 5 | ||||
| -rw-r--r-- | rild/rild.legacy.rc | 5 | ||||
| -rw-r--r-- | rild/rild.rc | 2 |
4 files changed, 18 insertions, 1 deletions
diff --git a/rild/Android.mk b/rild/Android.mk index 19eba74..f8220a8 100644 --- a/rild/Android.mk +++ b/rild/Android.mk @@ -30,6 +30,13 @@ LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_PROPRIETARY_MODULE := true LOCAL_MODULE:= rild +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 diff --git a/rild/rild.c b/rild/rild.c index 685ef70..c554a9f 100644 --- a/rild/rild.c +++ b/rild/rild.c @@ -35,8 +35,13 @@ #include <sys/types.h> #include <libril/ril_ex.h> +#if defined(PRODUCT_COMPATIBLE_PROPERTY) +#define LIB_PATH_PROPERTY "vendor.rild.libpath" +#define LIB_ARGS_PROPERTY "vendor.rild.libargs" +#else #define LIB_PATH_PROPERTY "rild.libpath" #define LIB_ARGS_PROPERTY "rild.libargs" +#endif #define MAX_LIB_ARGS 16 static void usage(const char *argv0) { diff --git a/rild/rild.legacy.rc b/rild/rild.legacy.rc new file mode 100644 index 0000000..b27e1da --- /dev/null +++ b/rild/rild.legacy.rc @@ -0,0 +1,5 @@ +service ril-daemon /vendor/bin/hw/rild + class main + user radio + group radio cache inet misc audio log readproc wakelock + capabilities BLOCK_SUSPEND NET_ADMIN NET_RAW diff --git a/rild/rild.rc b/rild/rild.rc index b27e1da..f6beb54 100644 --- a/rild/rild.rc +++ b/rild/rild.rc @@ -1,4 +1,4 @@ -service ril-daemon /vendor/bin/hw/rild +service vendor.ril-daemon /vendor/bin/hw/rild class main user radio group radio cache inet misc audio log readproc wakelock |