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

Commit 1d09a22e authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "Remove declaration of hidl manager -> base dep" am: 4ff4b2ee am:... 

Merge "Remove declaration of hidl manager -> base dep" am: 4ff4b2ee am: 742771fd am: e798d05a am: d53ccbc7

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1467918

Change-Id: If382fe51b02209c72089b7c0965f63c52fe1614f
parents 9989d3c8 d53ccbc7

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
@@ -248,8 +248,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. -->