diff options
| author | SpiritCroc <dev@spiritcroc.de> | 2019-12-11 16:56:15 +0100 |
|---|---|---|
| committer | SpiritCroc <dev@spiritcroc.de> | 2019-12-11 16:56:15 +0100 |
| commit | 1d3c1b9721450e1e5cb482ec08497f79f8a638de (patch) | |
| tree | d7b5573cc739cc6256e3c6f8acf500bb0bcd0eb9 | |
| parent | 8a970c0a10bb74fe11b7d720b20dc2d5d2dae6f0 (diff) | |
| parent | 96540129acf7e1e947771a8fd30f2ff350623ffc (diff) | |
Change-Id: I89664d8415ebae18d5e900bd48c7939e1152fe4e
| -rw-r--r-- | Android.mk | 8 | ||||
| -rw-r--r-- | macaddrsetup.c | 2 | ||||
| -rw-r--r-- | vendor/etc/init/macaddrsetup.rc | 2 | ||||
| -rw-r--r-- | vendor/etc/init/macaddrsetup_sdk25.rc | 11 |
4 files changed, 20 insertions, 3 deletions
@@ -22,10 +22,16 @@ LOCAL_SHARED_LIBRARIES := \ libcutils LOCAL_MODULE := macaddrsetup -ifneq ($(call math_gt_or_eq, $(PLATFORM_SDK_VERSION), 25),) +ifneq ($(call math_gt_or_eq, $(PLATFORM_SDK_VERSION), 29),) LOCAL_MODULE_OWNER := sony LOCAL_INIT_RC_64 := vendor/etc/init/macaddrsetup.rc LOCAL_PROPRIETARY_MODULE := true +else +ifneq ($(call math_gt_or_eq, $(PLATFORM_SDK_VERSION), 25),) +LOCAL_MODULE_OWNER := sony +LOCAL_INIT_RC_64 := vendor/etc/init/macaddrsetup_sdk25.rc +LOCAL_PROPRIETARY_MODULE := true +endif endif LOCAL_MODULE_TAGS := optional diff --git a/macaddrsetup.c b/macaddrsetup.c index c13d741..831a9e8 100644 --- a/macaddrsetup.c +++ b/macaddrsetup.c @@ -9,7 +9,7 @@ #include <sys/stat.h> #define LOG_TAG "macaddrsetup" -#include <cutils/log.h> +#include <log/log.h> #define LIB_TA "libta.so" diff --git a/vendor/etc/init/macaddrsetup.rc b/vendor/etc/init/macaddrsetup.rc index dbde89d..ad0345e 100644 --- a/vendor/etc/init/macaddrsetup.rc +++ b/vendor/etc/init/macaddrsetup.rc @@ -2,7 +2,7 @@ on post-fs-data mkdir /data/vendor/wifi 0770 wifi wifi # OSS WLAN and BT MAC setup -service macaddrsetup /vendor/bin/macaddrsetup ${ro.wifi.addr_path} +service macaddrsetup /vendor/bin/macaddrsetup ${ro.vendor.wifi.addr_path} class main user system group system bluetooth wifi diff --git a/vendor/etc/init/macaddrsetup_sdk25.rc b/vendor/etc/init/macaddrsetup_sdk25.rc new file mode 100644 index 0000000..dbde89d --- /dev/null +++ b/vendor/etc/init/macaddrsetup_sdk25.rc @@ -0,0 +1,11 @@ +on post-fs-data + mkdir /data/vendor/wifi 0770 wifi wifi + +# OSS WLAN and BT MAC setup +service macaddrsetup /vendor/bin/macaddrsetup ${ro.wifi.addr_path} + class main + user system + group system bluetooth wifi + capabilities NET_ADMIN NET_RAW + oneshot + |