Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5f84489 authored by Rohit Sekhar's avatar Rohit Sekhar
Browse files

Merge branch '1469devices-a15-FP6_tctd' into 'v3.1-a15' 

FP6: Include trace_util & tctd binaries

See merge request e/devices/android_device_fairphone_FP6!2
parents 0d2f2a5a 877b2b46

device.mk

+0 −2
Original line number Diff line number Diff line
@@ -185,7 +185,6 @@ PRODUCT_PACKAGES += \ 


# Init

PRODUCT_PACKAGES += \

    init.bt_mac.sh \

    init.class_main.sh \

    init.qcom.early_boot.sh \

    init.qcom.sh \
@@ -194,7 +193,6 @@ PRODUCT_PACKAGES += \ 
PRODUCT_PACKAGES += \

    fstab.qcom \

    fstab.qcom.vendor_ramdisk \

    init.bt_mac.rc \

    init.qcom.rc \

    init.recovery.qcom.rc \

    init.target.rc \

extract-files.py

+0 −2
Original line number Diff line number Diff line
@@ -57,8 +57,6 @@ blob_fixups: blob_fixups_user_type = { 
        .replace_needed('android.hidl.base@1.0.so', 'libhidlbase.so'),

    'system_ext/lib64/libwfdservice.so': blob_fixup()

        .replace_needed('android.media.audio.common.types-V2-cpp.so', 'android.media.audio.common.types-V4-cpp.so'),

    'system_ext/etc/init/fpconfig_util.rc': blob_fixup()

        .regex_replace('(on property:sys\.fp\.update_tar.*|exec.*/vendor/bin/trace_util.*)', ''),

    'vendor/etc/media_codecs_volcano_v1.xml': blob_fixup()

        .regex_replace('.*media_codecs_(google_audio|google_c2|google_telephony|vendor_audio).*\n', ''),

    'vendor/etc/seccomp_policy/gnss@2.0-qsap-location.policy': blob_fixup()

init/Android.bp

+0 −13
Original line number Diff line number Diff line
@@ -10,13 +10,6 @@ prebuilt_etc { 
    vendor_ramdisk_available: true,

}



prebuilt_etc {

    name: "init.bt_mac.rc",

    src: "init.bt_mac.rc",

    sub_dir: "init",

    vendor: true,

}



prebuilt_etc {

    name: "init.qcom.rc",

    src: "init.qcom.rc",
@@ -59,12 +52,6 @@ prebuilt_etc { 
    sub_dir: "init/hw",

}



sh_binary {

    name: "init.bt_mac.sh",

    src: "init.bt_mac.sh",

    vendor: true,

}



sh_binary {

    name: "init.class_main.sh",

    src: "init.class_main.sh",

init/init.bt_mac.rc

deleted100644 → 0
+0 −7
Original line number Diff line number Diff line 
service init.bt_mac /vendor/bin/init.bt_mac.sh

    class core

    group root system

    oneshot



on post-fs

    mkdir /mnt/vendor/persist/trace_info 0777 root system

init/init.bt_mac.sh

deleted100644 → 0
+0 −4
Original line number Diff line number Diff line 
#!/vendor/bin/sh

BT_MACADDR=/mnt/vendor/persist/trace_info/bt_macaddr



setprop persist.vendor.service.bdroid.bdaddr $(cat "$BT_MACADDR")