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

Commit 8c7495c2 authored by Justin Yun's avatar Justin Yun
Browse files

Use soong-built vintf/manifest.xml file 

vintf/manifest.xml is available in soong. Replace the prebuilt
manifest.xml file with the one that is built from soong.

Bug: 340427295
Bug: 376349660
Test: cat system/etc/vintf/manifest.xml
Change-Id: I441a03f7cfe874d692b79ac79b690be33bb430bd
parent 946e1291

target/product/generic/Android.bp

+1 −9
Original line number Diff line number Diff line
@@ -385,7 +385,6 @@ android_system_image { 
        "android.software.webview.prebuilt.xml", // media_system

        "android.software.window_magnification.prebuilt.xml", // handheld_system

        "android.system.suspend-service",

        "prebuilt_vintf_manifest",

        "apexd",

        "appops",

        "approved-ogki-builds.xml", // base_system
@@ -530,6 +529,7 @@ android_system_image { 
        "storaged", // base_system

        "surfaceflinger", // base_system

        "svc", // base_system

        "system_manifest.xml", // base_system

        "task_profiles.json", // base_system

        "tc", // base_system

        "telecom", // base_system
@@ -863,11 +863,3 @@ android_system_image { 
        },

    },

}
 


prebuilt_etc {

    name: "prebuilt_vintf_manifest",

    src: "manifest.xml",

    filename: "manifest.xml",

    relative_install_path: "vintf",

    no_full_install: true,

}

target/product/generic/manifest.xml

deleted100644 → 0
+0 −54
Original line number Diff line number Diff line 
<!--

    Input:

        system/libhidl/vintfdata/manifest.xml

-->

<manifest version="8.0" type="framework">

    <hal format="hidl" max-level="6">

        <name>android.frameworks.displayservice</name>

        <transport>hwbinder</transport>

        <fqname>@1.0::IDisplayService/default</fqname>

    </hal>

    <hal format="hidl" max-level="5">

        <name>android.frameworks.schedulerservice</name>

        <transport>hwbinder</transport>

        <fqname>@1.0::ISchedulingPolicyService/default</fqname>

    </hal>

    <hal format="aidl">

        <name>android.frameworks.sensorservice</name>

        <fqname>ISensorManager/default</fqname>

    </hal>

    <hal format="hidl" max-level="8">

        <name>android.frameworks.sensorservice</name>

        <transport>hwbinder</transport>

        <fqname>@1.0::ISensorManager/default</fqname>

    </hal>

    <hal format="hidl" max-level="8">

        <name>android.hidl.memory</name>

        <transport arch="32+64">passthrough</transport>

        <fqname>@1.0::IMapper/ashmem</fqname>

    </hal>

    <hal format="hidl" max-level="7">

        <name>android.system.net.netd</name>

        <transport>hwbinder</transport>

        <fqname>@1.1::INetd/default</fqname>

    </hal>

    <hal format="hidl" max-level="7">

        <name>android.system.wifi.keystore</name>

        <transport>hwbinder</transport>

        <fqname>@1.0::IKeystore/default</fqname>

    </hal>

    <hal format="native">

        <name>netutils-wrapper</name>

        <version>1.0</version>

    </hal>

    <system-sdk>

        <version>29</version>

        <version>30</version>

        <version>31</version>

        <version>32</version>

        <version>33</version>

        <version>34</version>

        <version>35</version>

        <version>VanillaIceCream</version>

    </system-sdk>

</manifest>