Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove declaration of hidl manager -> base dep" am: 4ff4b2ee17 am: 742771fdd7

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

Change-Id: If25601a8cd9024de12655c73ac587ab116ad845c
This commit is contained in:
Steven Moreland
2020-10-22 00:32:52 +00:00
committed by Automerger Merge Worker
parent 288d0e923a 742771fdd7
commit e798d05a73
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/com/android/internal/os/ZygoteInit.java
View File

@@ -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*/,

3
data/etc/platform.xml
View File

@@ -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. -->