diff options
author | Arian <arian.kulmer@web.de> | 2019-08-17 18:15:24 +0200 |
---|---|---|
committer | Arian <arian.kulmer@web.de> | 2019-10-25 22:16:13 +0200 |
commit | f830aea419318e71934683a56652b18db782105f (patch) | |
tree | 073827de9637ae83a69e96716db62bf973245ef1 | |
parent | 03e187ba0c3beba4ad529922d9328887d222aa90 (diff) |
shinano-common: Restructure rootdir folder
-rw-r--r-- | BoardConfigCommon.mk | 2 | ||||
-rw-r--r-- | configs/keylayout/gpio-keys.kl (renamed from rootdir/system/usr/keylayout/gpio-keys.kl) | 0 | ||||
-rw-r--r-- | configs/keylayout/mhl-rcp.kl (renamed from rootdir/system/usr/keylayout/mhl-rcp.kl) | 0 | ||||
-rw-r--r-- | configs/keylayout/msm8974-taiko-mtp-snd-card_Button_Jack.kl (renamed from rootdir/system/usr/keylayout/msm8974-taiko-mtp-snd-card_Button_Jack.kl) | 0 | ||||
-rw-r--r-- | configs/nfc/nfcee_access.xml (renamed from rootdir/system/etc/nfcee_access.xml) | 0 | ||||
-rw-r--r-- | configs/sec_config (renamed from rootdir/system/etc/sec_config) | 0 | ||||
-rwxr-xr-x | rootdir/bin/credmgrfirstboot.sh (renamed from rootdir/system/vendor/bin/credmgrfirstboot.sh) | 0 | ||||
-rw-r--r-- | rootdir/bin/init.qcom-sensor.sh (renamed from rootdir/system/vendor/bin/init.qcom-sensor.sh) | 2 | ||||
-rw-r--r-- | rootdir/etc/fstab.qcom (renamed from rootdir/fstab.qcom) | 0 | ||||
-rw-r--r-- | rootdir/etc/init.camera.rc (renamed from rootdir/init.camera.rc) | 0 | ||||
-rw-r--r-- | rootdir/etc/init.platform-common.rc (renamed from rootdir/init.platform-common.rc) | 0 | ||||
-rw-r--r-- | rootdir/etc/init.qcom.power.rc (renamed from rootdir/init.qcom.power.rc) | 0 | ||||
-rw-r--r-- | rootdir/etc/init.qcom.rc (renamed from rootdir/init.qcom.rc) | 0 | ||||
-rw-r--r-- | rootdir/etc/init.recovery.qcom.rc (renamed from rootdir/init.recovery.qcom.rc) | 0 | ||||
-rw-r--r-- | rootdir/etc/init.sony.rc (renamed from rootdir/init.sony.rc) | 0 | ||||
-rw-r--r-- | rootdir/etc/init.sony.usb.rc (renamed from rootdir/init.sony.usb.rc) | 0 | ||||
-rw-r--r-- | rootdir/etc/ueventd.qcom.rc (renamed from rootdir/ueventd.qcom.rc) | 0 | ||||
-rw-r--r-- | shinano.mk | 32 |
18 files changed, 18 insertions, 18 deletions
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index d9a9bfc..86ca07d 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -108,5 +108,5 @@ BOARD_CACHEIMAGE_PARTITION_SIZE := 209715200 BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2671771648 # Recovery -TARGET_RECOVERY_FSTAB := device/sony/shinano-common/rootdir/fstab.qcom +TARGET_RECOVERY_FSTAB := device/sony/shinano-common/rootdir/etc/fstab.qcom TARGET_RECOVERY_PIXEL_FORMAT := "RGBA_8888" diff --git a/rootdir/system/usr/keylayout/gpio-keys.kl b/configs/keylayout/gpio-keys.kl index e654ad3..e654ad3 100644 --- a/rootdir/system/usr/keylayout/gpio-keys.kl +++ b/configs/keylayout/gpio-keys.kl diff --git a/rootdir/system/usr/keylayout/mhl-rcp.kl b/configs/keylayout/mhl-rcp.kl index 69cadea..69cadea 100644 --- a/rootdir/system/usr/keylayout/mhl-rcp.kl +++ b/configs/keylayout/mhl-rcp.kl diff --git a/rootdir/system/usr/keylayout/msm8974-taiko-mtp-snd-card_Button_Jack.kl b/configs/keylayout/msm8974-taiko-mtp-snd-card_Button_Jack.kl index 550ca30..550ca30 100644 --- a/rootdir/system/usr/keylayout/msm8974-taiko-mtp-snd-card_Button_Jack.kl +++ b/configs/keylayout/msm8974-taiko-mtp-snd-card_Button_Jack.kl diff --git a/rootdir/system/etc/nfcee_access.xml b/configs/nfc/nfcee_access.xml index 1927f58..1927f58 100644 --- a/rootdir/system/etc/nfcee_access.xml +++ b/configs/nfc/nfcee_access.xml diff --git a/rootdir/system/etc/sec_config b/configs/sec_config index 24a2a9e..24a2a9e 100644 --- a/rootdir/system/etc/sec_config +++ b/configs/sec_config diff --git a/rootdir/system/vendor/bin/credmgrfirstboot.sh b/rootdir/bin/credmgrfirstboot.sh index 3b3ade9..3b3ade9 100755 --- a/rootdir/system/vendor/bin/credmgrfirstboot.sh +++ b/rootdir/bin/credmgrfirstboot.sh diff --git a/rootdir/system/vendor/bin/init.qcom-sensor.sh b/rootdir/bin/init.qcom-sensor.sh index f8ab53f..21d24c7 100644 --- a/rootdir/system/vendor/bin/init.qcom-sensor.sh +++ b/rootdir/bin/init.qcom-sensor.sh @@ -1,4 +1,4 @@ -#!/system/vendor/bin/sh +#!/system/bin/sh # Copyright (C) 2013 Sony Mobile Communications AB. # diff --git a/rootdir/fstab.qcom b/rootdir/etc/fstab.qcom index e5cdaf7..e5cdaf7 100644 --- a/rootdir/fstab.qcom +++ b/rootdir/etc/fstab.qcom diff --git a/rootdir/init.camera.rc b/rootdir/etc/init.camera.rc index eb1092c..eb1092c 100644 --- a/rootdir/init.camera.rc +++ b/rootdir/etc/init.camera.rc diff --git a/rootdir/init.platform-common.rc b/rootdir/etc/init.platform-common.rc index 58a3063..58a3063 100644 --- a/rootdir/init.platform-common.rc +++ b/rootdir/etc/init.platform-common.rc diff --git a/rootdir/init.qcom.power.rc b/rootdir/etc/init.qcom.power.rc index 809e37e..809e37e 100644 --- a/rootdir/init.qcom.power.rc +++ b/rootdir/etc/init.qcom.power.rc diff --git a/rootdir/init.qcom.rc b/rootdir/etc/init.qcom.rc index b84f7b8..b84f7b8 100644 --- a/rootdir/init.qcom.rc +++ b/rootdir/etc/init.qcom.rc diff --git a/rootdir/init.recovery.qcom.rc b/rootdir/etc/init.recovery.qcom.rc index 4d427f1..4d427f1 100644 --- a/rootdir/init.recovery.qcom.rc +++ b/rootdir/etc/init.recovery.qcom.rc diff --git a/rootdir/init.sony.rc b/rootdir/etc/init.sony.rc index 0902fd2..0902fd2 100644 --- a/rootdir/init.sony.rc +++ b/rootdir/etc/init.sony.rc diff --git a/rootdir/init.sony.usb.rc b/rootdir/etc/init.sony.usb.rc index 679a600..679a600 100644 --- a/rootdir/init.sony.usb.rc +++ b/rootdir/etc/init.sony.usb.rc diff --git a/rootdir/ueventd.qcom.rc b/rootdir/etc/ueventd.qcom.rc index e1ae27d..e1ae27d 100644 --- a/rootdir/ueventd.qcom.rc +++ b/rootdir/etc/ueventd.qcom.rc @@ -41,18 +41,18 @@ PRODUCT_COPY_FILES += \ # Init PRODUCT_COPY_FILES += \ - $(COMMON_PATH)/rootdir/fstab.qcom:root/fstab.qcom \ - $(COMMON_PATH)/rootdir/init.qcom.rc:root/init.qcom.rc \ - $(COMMON_PATH)/rootdir/init.camera.rc:root/init.camera.rc \ - $(COMMON_PATH)/rootdir/init.platform-common.rc:root/init.platform-common.rc \ - $(COMMON_PATH)/rootdir/init.sony.rc:root/init.sony.rc \ - $(COMMON_PATH)/rootdir/init.qcom.power.rc:root/init.qcom.power.rc \ - $(COMMON_PATH)/rootdir/init.sony.usb.rc:root/init.sony.usb.rc \ - $(COMMON_PATH)/rootdir/ueventd.qcom.rc:root/ueventd.qcom.rc + $(COMMON_PATH)/rootdir/etc/fstab.qcom:root/fstab.qcom \ + $(COMMON_PATH)/rootdir/etc/init.qcom.rc:root/init.qcom.rc \ + $(COMMON_PATH)/rootdir/etc/init.camera.rc:root/init.camera.rc \ + $(COMMON_PATH)/rootdir/etc/init.platform-common.rc:root/init.platform-common.rc \ + $(COMMON_PATH)/rootdir/etc/init.sony.rc:root/init.sony.rc \ + $(COMMON_PATH)/rootdir/etc/init.qcom.power.rc:root/init.qcom.power.rc \ + $(COMMON_PATH)/rootdir/etc/init.sony.usb.rc:root/init.sony.usb.rc \ + $(COMMON_PATH)/rootdir/etc/ueventd.qcom.rc:root/ueventd.qcom.rc # Recovery Init PRODUCT_COPY_FILES += \ - $(COMMON_PATH)/rootdir/init.recovery.qcom.rc:root/init.recovery.qcom.rc + $(COMMON_PATH)/rootdir/etc/init.recovery.qcom.rc:root/init.recovery.qcom.rc # Camera PRODUCT_COPY_FILES += \ @@ -63,7 +63,7 @@ PRODUCT_PACKAGES += \ libshim_camera PRODUCT_COPY_FILES += \ - $(COMMON_PATH)/rootdir/system/vendor/bin/credmgrfirstboot.sh:$(TARGET_COPY_OUT_VENDOR)/bin/credmgrfirstboot.sh + $(COMMON_PATH)/rootdir/bin/credmgrfirstboot.sh:$(TARGET_COPY_OUT_VENDOR)/bin/credmgrfirstboot.sh # Audio PRODUCT_COPY_FILES += \ @@ -120,7 +120,7 @@ PRODUCT_PACKAGES += \ # IPC Security Config PRODUCT_COPY_FILES += \ - $(COMMON_PATH)/rootdir/system/etc/sec_config:system/vendor/etc/sec_config + $(COMMON_PATH)/configs/sec_config:system/vendor/etc/sec_config # Keystore PRODUCT_PACKAGES += \ @@ -128,9 +128,9 @@ PRODUCT_PACKAGES += \ # Keylayout PRODUCT_COPY_FILES += \ - $(COMMON_PATH)/rootdir/system/usr/keylayout/gpio-keys.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/gpio-keys.kl \ - $(COMMON_PATH)/rootdir/system/usr/keylayout/mhl-rcp.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/mhl-rcp.kl \ - $(COMMON_PATH)/rootdir/system/usr/keylayout/msm8974-taiko-mtp-snd-card_Button_Jack.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/msm8974-taiko-mtp-snd-card_Button_Jack.kl + $(COMMON_PATH)/configs/keylayout/gpio-keys.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/gpio-keys.kl \ + $(COMMON_PATH)/configs/keylayout/mhl-rcp.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/mhl-rcp.kl \ + $(COMMON_PATH)/configs/keylayout/msm8974-taiko-mtp-snd-card_Button_Jack.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/msm8974-taiko-mtp-snd-card_Button_Jack.kl # MAC address - BT and Wi-Fi PRODUCT_PACKAGES += \ @@ -148,7 +148,7 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ ro.hardware.nfc_nci=pn54x.default PRODUCT_COPY_FILES += \ - $(COMMON_PATH)/rootdir/system/etc/nfcee_access.xml:$(TARGET_COPY_OUT_VENDOR)/etc/nfcee_access.xml \ + $(COMMON_PATH)/configs/nfc/nfcee_access.xml:$(TARGET_COPY_OUT_VENDOR)/etc/nfcee_access.xml \ frameworks/native/data/etc/android.hardware.nfc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.xml \ frameworks/native/data/etc/android.hardware.nfc.hce.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.hce.xml \ frameworks/native/data/etc/com.android.nfc_extras.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.android.nfc_extras.xml \ @@ -163,7 +163,7 @@ include $(COMMON_PATH)/system_prop.mk # Sensor file PRODUCT_COPY_FILES += \ - $(COMMON_PATH)/rootdir/system/vendor/bin/init.qcom-sensor.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.qcom-sensor.sh + $(COMMON_PATH)/rootdir/bin/init.qcom-sensor.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.qcom-sensor.sh # BCM Wifi $(call inherit-product-if-exists, hardware/broadcom/wlan/bcmdhd/firmware/bcm4339/device-bcm.mk) |