Use only treble property in the cuttlefish rild
When full treble is enabled in newer platform versions, it is no longer
possible to use rild.libpath; we must use vendor.rild.libpath instead.
As using this property works for old platform versions too, just
unconditionally enable use of the new property name.
Bug: 129163131
Change-Id: I41ef3f32dfaa93d2666338109b7e5d1c0f8ccf10
diff --git a/guest/hals/rild/rild_cuttlefish.c b/guest/hals/rild/rild_cuttlefish.c
index 064a4d1..c2efe44 100644
--- a/guest/hals/rild/rild_cuttlefish.c
+++ b/guest/hals/rild/rild_cuttlefish.c
@@ -36,13 +36,8 @@
#include <sys/types.h>
#include <guest/hals/ril/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) {
