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

Merge "SharedLibraryInfo.isNative() returns true for native libs"

Browse Source
This commit is contained in:
TreeHugger Robot
2020-11-26 23:14:13 +00:00
committed by Android (Google) Code Review
parent 915c815579 4e4e82225a
commit bf598cdfbc
6 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/content/pm/SharedLibraryInfo.java
View File

@@ -114,15 +114,6 @@ public final class SharedLibraryInfo implements Parcelable {
mIsNative = isNative;
}
/** @hide */
public SharedLibraryInfo(String path, String packageName, List<String> codePaths,
String name, long version, int type,
VersionedPackage declaringPackage, List<VersionedPackage> dependentPackages,
List<SharedLibraryInfo> dependencies) {
this(path, packageName, codePaths, name, version, type, declaringPackage, dependentPackages,
dependencies, false /* isNative */);
}
private SharedLibraryInfo(Parcel parcel) {
mPath = parcel.readString8();
mPackageName = parcel.readString8();

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

@@ -391,16 +391,19 @@ public class ZygoteInit {
SharedLibraryInfo hidlBase = new SharedLibraryInfo(
"/system/framework/android.hidl.base-V1.0-java.jar", null /*packageName*/,
null /*codePaths*/, null /*name*/, 0 /*version*/, SharedLibraryInfo.TYPE_BUILTIN,
null /*declaringPackage*/, null /*dependentPackages*/, null /*dependencies*/);
null /*declaringPackage*/, null /*dependentPackages*/, null /*dependencies*/,
false /*isNative*/);
SharedLibraryInfo hidlManager = new SharedLibraryInfo(
"/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*/);
null /*declaringPackage*/, null /*dependentPackages*/, null /*dependencies*/,
false /*isNative*/);
SharedLibraryInfo androidTestBase = new SharedLibraryInfo(
"/system/framework/android.test.base.jar", null /*packageName*/,
null /*codePaths*/, null /*name*/, 0 /*version*/, SharedLibraryInfo.TYPE_BUILTIN,
null /*declaringPackage*/, null /*dependentPackages*/, null /*dependencies*/);
null /*declaringPackage*/, null /*dependentPackages*/, null /*dependencies*/,
false /*isNative*/);
ApplicationLoaders.getDefault().createAndCacheNonBootclasspathSystemClassLoaders(
new SharedLibraryInfo[]{

2
core/tests/coretests/src/android/app/ApplicationLoadersTest.java
View File

@@ -42,7 +42,7 @@ public class ApplicationLoadersTest {
return new SharedLibraryInfo(
zip, null /*packageName*/, null /*codePaths*/, null /*name*/, 0 /*version*/,
SharedLibraryInfo.TYPE_BUILTIN, null /*declaringPackage*/,
null /*dependentPackages*/, null /*dependencies*/);
null /*dependentPackages*/, null /*dependencies*/, false /*isNative*/);
}
@Test

6
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -5717,7 +5717,8 @@ public class PackageManagerService extends IPackageManager.Stub
getPackagesUsingSharedLibraryLPr(libInfo, flags, userId),
(libInfo.getDependencies() == null
? null
: new ArrayList<>(libInfo.getDependencies())));
: new ArrayList<>(libInfo.getDependencies())),
libInfo.isNative());
if (result == null) {
result = new ArrayList<>();
@@ -5786,7 +5787,8 @@ public class PackageManagerService extends IPackageManager.Stub
libraryInfo.getLongVersion(), libraryInfo.getType(),
libraryInfo.getDeclaringPackage(), getPackagesUsingSharedLibraryLPr(
libraryInfo, flags, userId), libraryInfo.getDependencies() == null
? null : new ArrayList<>(libraryInfo.getDependencies()));
? null : new ArrayList<>(libraryInfo.getDependencies()),
libraryInfo.isNative());
if (result == null) {
result = new ArrayList<>();

4
services/core/java/com/android/server/pm/parsing/pkg/AndroidPackageUtils.java
View File

@@ -94,7 +94,7 @@ public class AndroidPackageUtils {
SharedLibraryInfo.TYPE_STATIC,
new VersionedPackage(pkg.getManifestPackageName(),
pkg.getLongVersionCode()),
null, null);
null, null, false /* isNative */);
}
public static SharedLibraryInfo createSharedLibraryForDynamic(AndroidPackage pkg, String name) {
@@ -103,7 +103,7 @@ public class AndroidPackageUtils {
SharedLibraryInfo.VERSION_UNDEFINED,
SharedLibraryInfo.TYPE_DYNAMIC, new VersionedPackage(pkg.getPackageName(),
pkg.getLongVersionCode()),
null, null);
null, null, false /* isNative */);
}
/**

2
services/tests/servicestests/src/com/android/server/pm/dex/DexoptUtilsTest.java
View File

@@ -134,7 +134,7 @@ public class DexoptUtilsTest {
private List<SharedLibraryInfo> createMockSharedLibrary(String [] sharedLibrary) {
SharedLibraryInfo info = new SharedLibraryInfo(null, null, Arrays.asList(sharedLibrary),
null, 0L, SharedLibraryInfo.TYPE_STATIC, null, null, null);
null, 0L, SharedLibraryInfo.TYPE_STATIC, null, null, null, false /* isNative */);
ArrayList<SharedLibraryInfo> libraries = new ArrayList<>();
libraries.add(info);
return libraries;