modularize pktrouter

Bug: 190331212
Test: make sure pktrouter gets initialized
06-23 13:21:19.372  1 1 I init : Parsing file /vendor/etc/init/pktrouter.rc...
06-23 13:21:23.510     1     1 I init    : processing action (vendor.pktrouter=1) from (/vendor/etc/init/pktrouter.rc:7)
06-23 13:21:23.510     1     1 I init    : starting service 'pktrouter'...
Change-Id: I89de2b2dd151bba877dea0bd5db0df1048b2ab6b
This commit is contained in:
Adam Shih 2021-06-22 14:16:38 +08:00
parent 48a283b16e
commit c7884a192e
3 changed files with 4 additions and 33 deletions

View file

@ -705,35 +705,6 @@ on property:sys.boot_completed=1
chown root system /sys/devices/platform/19000000.aoc/reset chown root system /sys/devices/platform/19000000.aoc/reset
chmod 0220 /sys/devices/platform/19000000.aoc/reset chmod 0220 /sys/devices/platform/19000000.aoc/reset
# IMS WiFi Calling
service charonservice /system/vendor/bin/charon
class main
user root
disabled
seclabel u:r:charonservice:s0
on property:vendor.charon.exec=1
rm /data/vendor/misc/vpn/charon.pid
chmod 0666 /dev/tun
start charonservice
on property:vendor.charon.exec=0
stop charonservice
rm /data/vendor/misc/vpn/charon.pid
# IMS packet router daemon
service pktrouter /system/vendor/bin/wfc-pkt-router
class main
user root
disabled
seclabel u:r:pktrouter:s0
on property:vendor.pktrouter=1
start pktrouter
on property:vendor.pktrouter=0
stop pktrouter
# charger driver exposes now finer grain control, map demo mode to those properties # charger driver exposes now finer grain control, map demo mode to those properties
# NOTE: demo mode can only be exit wiping data (which reset the persist properties) # NOTE: demo mode can only be exit wiping data (which reset the persist properties)
on property:sys.retaildemo.enabled=1 on property:sys.retaildemo.enabled=1

View file

@ -855,7 +855,7 @@ $(call inherit-product-if-exists, vendor/samsung_slsi/telephony/shannon-ims/devi
PRODUCT_PACKAGES += ShannonIms PRODUCT_PACKAGES += ShannonIms
$(call inherit-product-if-exists, vendor/samsung_slsi/telephony/shannon-iwlan/device-vendor.mk) $(call inherit-product-if-exists, vendor/samsung_slsi/telephony/shannon-iwlan/device-vendor.mk)
$(call inherit-product-if-exists, vendor/samsung_slsi/telephony/packetrouter/device-vendor.mk) include device/google/gs101/telephony/pktrouter.mk
#RCS Test Messaging App #RCS Test Messaging App
PRODUCT_PACKAGES_DEBUG += \ PRODUCT_PACKAGES_DEBUG += \
@ -1050,9 +1050,6 @@ PRODUCT_PACKAGES += \
libgc2_cwl \ libgc2_cwl \
libgc2_utils libgc2_utils
# Start packet router
PRODUCT_PROPERTY_OVERRIDES += vendor.pktrouter=1
# Thermal HAL # Thermal HAL
include hardware/google/pixel/thermal/device.mk include hardware/google/pixel/thermal/device.mk
PRODUCT_PROPERTY_OVERRIDES += persist.vendor.enable.thermal.genl=true PRODUCT_PROPERTY_OVERRIDES += persist.vendor.enable.thermal.genl=true

3
telephony/pktrouter.mk Normal file
View file

@ -0,0 +1,3 @@
PRODUCT_PACKAGES += wfc-pkt-router
PRODUCT_PROPERTY_OVERRIDES += vendor.pktrouter=1
BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs101-sepolicy/telephony/pktrouter