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

Commit fb52599e authored by Steven Moreland's avatar Steven Moreland
Browse files

Remove declaration of hidl manager -> base dep 

This dependency is fictitious: hidl manager actually contains a static
copy of hidl base for convenience. Separate libraries were created
later (e.g. android.hidl.manager-java-shallow) in order for users of
these libraries to specify the exact deps they need.

Fixes: 170710203
Test: boot and check logs

:) adb logcat | grep android.hidl.manager-V1.0-java.jar
10-21 00:42:53.173   328   328 D ApplicationLoaders: Created zygote-cached class loader: /system/framework/android.hidl.manager-V1.0-java.jar
10-21 00:43:17.322   329   329 D ApplicationLoaders: Created zygote-cached class loader: /system/framework/android.hidl.manager-V1.0-java.jar
10-21 00:43:31.920  2250  2250 D ApplicationLoaders: Returning zygote-cached class loader: /system/framework/android.hidl.manager-V1.0-java.jar
10-21 00:43:38.884  2847  2847 D ApplicationLoaders: Returning zygote-cached class loader: /system/framework/android.hidl.manager-V1.0-java.jar
10-21 00:43:41.010  2923  2923 D ApplicationLoaders: Returning zygote-cached class loader: /system/framework/android.hidl.manager-V1.0-java.jar
10-21 00:43:42.146  3044  3044 D ApplicationLoaders: Returning zygote-cached class loader: /system/framework/android.hidl.manager-V1.0-java.jar

Change-Id: I024a1b16570bdceb7bef5b2e718c65155c675b4a
parent a80fb3bb

core/java/com/android/internal/os/ZygoteInit.java

+0 −1
Original line number Diff line number Diff line
@@ -385,7 +385,6 @@ public class ZygoteInit { 
                "/system/framework/android.hidl.manager-V1.0-java.jar", null /*packageName*/,

                null /*codePaths*/, null /*name*/, 0 /*version*/, SharedLibraryInfo.TYPE_BUILTIN,

                null /*declaringPackage*/, null /*dependentPackages*/, null /*dependencies*/);

        hidlManager.addDependency(hidlBase);



        SharedLibraryInfo androidTestBase = new SharedLibraryInfo(

                "/system/framework/android.test.base.jar", null /*packageName*/,

data/etc/platform.xml

+1 −2
Original line number Diff line number Diff line
@@ -236,8 +236,7 @@ 
    <library name="android.hidl.base-V1.0-java"

            file="/system/framework/android.hidl.base-V1.0-java.jar" />

    <library name="android.hidl.manager-V1.0-java"

            file="/system/framework/android.hidl.manager-V1.0-java.jar"

            dependency="android.hidl.base-V1.0-java" />

            file="/system/framework/android.hidl.manager-V1.0-java.jar" />



    <!-- These are the standard packages that are white-listed to always have internet

         access while in power save mode, even if they aren't in the foreground. -->