diff options
Diffstat (limited to '')
| -rw-r--r-- | Android.mk | 9 | ||||
| -rw-r--r-- | etc/Android.mk | 32 | ||||
| -rw-r--r-- | etc/init.rc | 39 | ||||
| -rw-r--r-- | etc/init.recovery.usb.rc | 38 |
4 files changed, 79 insertions, 39 deletions
diff --git a/Android.mk b/Android.mk index 0f923a8cb..664c487e8 100644 --- a/Android.mk +++ b/Android.mk @@ -308,6 +308,9 @@ endif ifneq ($(wildcard bionic/libc/include/sys/capability.h),) LOCAL_CFLAGS += -DHAVE_CAPABILITIES endif +ifneq ($(TARGET_RECOVERY_INITRC),) + TW_EXCLUDE_DEFAULT_USB_INIT := true +endif LOCAL_ADDITIONAL_DEPENDENCIES := \ dump_image \ @@ -370,6 +373,9 @@ endif ifeq ($(TW_INCLUDE_INJECTTWRP), true) LOCAL_ADDITIONAL_DEPENDENCIES += injecttwrp endif +ifneq ($(TW_EXCLUDE_DEFAULT_USB_INIT), true) + LOCAL_ADDITIONAL_DEPENDENCIES += init.recovery.usb.rc +endif # Allow devices to specify device-specific recovery dependencies ifneq ($(TARGET_RECOVERY_DEVICE_MODULES),) LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_RECOVERY_DEVICE_MODULES) @@ -503,7 +509,8 @@ include $(commands_recovery_local_path)/injecttwrp/Android.mk \ $(commands_recovery_local_path)/twrpTarMain/Android.mk \ $(commands_recovery_local_path)/mtp/Android.mk \ $(commands_recovery_local_path)/minzip/Android.mk \ - $(commands_recovery_local_path)/dosfstools/Android.mk + $(commands_recovery_local_path)/dosfstools/Android.mk \ + $(commands_recovery_local_path)/etc/Android.mk ifeq ($(TW_INCLUDE_CRYPTO), true) include $(commands_recovery_local_path)/crypto/lollipop/Android.mk diff --git a/etc/Android.mk b/etc/Android.mk new file mode 100644 index 000000000..89ea0cc13 --- /dev/null +++ b/etc/Android.mk @@ -0,0 +1,32 @@ +# Copyright (C) 2015 TeamWin Recovery 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. + +ifneq ($(TW_EXCLUDE_DEFAULT_USB_INIT), true) + +LOCAL_PATH := $(call my-dir) + +include $(CLEAR_VARS) +LOCAL_MODULE := init.recovery.usb.rc +LOCAL_MODULE_TAGS := eng +LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES + +# Cannot send to TARGET_RECOVERY_ROOT_OUT since build system wipes init*.rc +# during ramdisk creation and only allows init.recovery.*.rc files to be copied +# from TARGET_ROOT_OUT thereafter +LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT) + +LOCAL_SRC_FILES := $(LOCAL_MODULE) +include $(BUILD_PREBUILT) + +endif diff --git a/etc/init.rc b/etc/init.rc index f77c39ba3..4e7b84506 100644 --- a/etc/init.rc +++ b/etc/init.rc @@ -1,3 +1,4 @@ +import /init.recovery.usb.rc import /init.recovery.${ro.hardware}.rc on early-init @@ -43,15 +44,6 @@ on fs mkdir /dev/usb-ffs/adb 0770 shell shell mount functionfs adb /dev/usb-ffs/adb uid=2000,gid=2000 - write /sys/class/android_usb/android0/enable 0 - write /sys/class/android_usb/android0/idVendor 18D1 - write /sys/class/android_usb/android0/idProduct 4EE2 - write /sys/class/android_usb/android0/f_ffs/aliases adb - write /sys/class/android_usb/android0/functions mtp,adb - write /sys/class/android_usb/android0/iManufacturer ${ro.product.manufacturer} - write /sys/class/android_usb/android0/iProduct ${ro.product.model} - write /sys/class/android_usb/android0/iSerial ${ro.serialno} - on boot ifup lo hostname localhost @@ -87,35 +79,6 @@ on late-init on property:sys.powerctl=* powerctl ${sys.powerctl} -on property:sys.storage.ums_enabled=1 - write /sys/class/android_usb/android0/enable 0 - write /sys/class/android_usb/android0/functions mass_storage,adb - write /sys/class/android_usb/android0/enable 1 - -on property:sys.storage.ums_enabled=0 - write /sys/class/android_usb/android0/enable 0 - write /sys/class/android_usb/android0/functions ${sys.usb.config} - write /sys/class/android_usb/android0/enable ${service.adb.root} - -on property:sys.usb.config=none - stop adbd - write /sys/class/android_usb/android0/enable 0 - write /sys/class/android_usb/android0/bDeviceClass 0 - -on property:sys.usb.config=mtp,adb - stop adbd - write /sys/class/android_usb/android0/enable 0 - write /sys/class/android_usb/android0/functions mtp,adb - write /sys/class/android_usb/android0/enable 1 - start adbd - -on property:sys.usb.config=adb - stop adbd - write /sys/class/android_usb/android0/enable 0 - write /sys/class/android_usb/android0/functions adb - write /sys/class/android_usb/android0/enable ${service.adb.root} - start adbd - service ueventd /sbin/ueventd critical seclabel u:r:ueventd:s0 diff --git a/etc/init.recovery.usb.rc b/etc/init.recovery.usb.rc new file mode 100644 index 000000000..b4a852a13 --- /dev/null +++ b/etc/init.recovery.usb.rc @@ -0,0 +1,38 @@ +on fs + write /sys/class/android_usb/android0/enable 0 + write /sys/class/android_usb/android0/idVendor 18D1 + write /sys/class/android_usb/android0/idProduct 4EE2 + write /sys/class/android_usb/android0/f_ffs/aliases adb + write /sys/class/android_usb/android0/functions mtp,adb + write /sys/class/android_usb/android0/iManufacturer ${ro.product.manufacturer} + write /sys/class/android_usb/android0/iProduct ${ro.product.model} + write /sys/class/android_usb/android0/iSerial ${ro.serialno} + +on property:sys.storage.ums_enabled=1 + write /sys/class/android_usb/android0/enable 0 + write /sys/class/android_usb/android0/functions mass_storage,adb + write /sys/class/android_usb/android0/enable 1 + +on property:sys.storage.ums_enabled=0 + write /sys/class/android_usb/android0/enable 0 + write /sys/class/android_usb/android0/functions ${sys.usb.config} + write /sys/class/android_usb/android0/enable ${service.adb.root} + +on property:sys.usb.config=none + stop adbd + write /sys/class/android_usb/android0/enable 0 + write /sys/class/android_usb/android0/bDeviceClass 0 + +on property:sys.usb.config=mtp,adb + stop adbd + write /sys/class/android_usb/android0/enable 0 + write /sys/class/android_usb/android0/functions mtp,adb + write /sys/class/android_usb/android0/enable 1 + start adbd + +on property:sys.usb.config=adb + stop adbd + write /sys/class/android_usb/android0/enable 0 + write /sys/class/android_usb/android0/functions adb + write /sys/class/android_usb/android0/enable ${service.adb.root} + start adbd |