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

am b181118b: Define TARGET_CPU_ABI for finding native code in .apks

Browse Source 
Merge commit 'b181118b6e58c0014da4e9d52bf38548adc73a8a'

* commit 'b181118b6e58c0014da4e9d52bf38548adc73a8a':
  Define TARGET_CPU_ABI for finding native code in .apks
This commit is contained in:
Dianne Hackborn
2009-05-22 18:47:12 -07:00
committed by The Android Open Source Project
parent aaafa4fb1c b181118b6e
commit 385bb79ebb
5 changed files with 52 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
services/java/com/android/server/PackageManagerService.java
View File

@@ -2154,16 +2154,9 @@ class PackageManagerService extends IPackageManager.Stub {
String path = scanFile.getPath();
if (scanFileNewer) {
Log.i(TAG, path + " changed; unpacking");
try {
cachePackageSharedLibsLI(pkg, dataPath, scanFile);
} catch (IOException e) {
Log.e(TAG, "Failure extracting shared libs", e);
if(mInstaller != null) {
mInstaller.remove(pkgName);
} else {
dataPath.delete();
}
mLastScanError = PackageManager.INSTALL_FAILED_INSUFFICIENT_STORAGE;
int err = cachePackageSharedLibsLI(pkg, dataPath, scanFile);
if (err != PackageManager.INSTALL_SUCCEEDED) {
mLastScanError = err;
return null;
}
}
@@ -2447,14 +2440,15 @@ class PackageManagerService extends IPackageManager.Stub {
return pkg;
}
private void cachePackageSharedLibsLI(PackageParser.Package pkg,
File dataPath, File scanFile) throws IOException {
private int cachePackageSharedLibsLI(PackageParser.Package pkg,
File dataPath, File scanFile) {
File sharedLibraryDir = new File(dataPath.getPath() + "/lib");
final String sharedLibraryABI = "armeabi";
final String sharedLibraryABI = Build.CPU_ABI;
final String apkLibraryDirectory = "lib/" + sharedLibraryABI + "/";
final String apkSharedLibraryPrefix = apkLibraryDirectory + "lib";
final String sharedLibrarySuffix = ".so";
boolean createdSharedLib = false;
boolean hasNativeCode = false;
boolean installedNativeCode = false;
try {
ZipFile zipFile = new ZipFile(scanFile);
Enumeration<ZipEntry> entries =
@@ -2463,9 +2457,15 @@ class PackageManagerService extends IPackageManager.Stub {
while (entries.hasMoreElements()) {
ZipEntry entry = entries.nextElement();
if (entry.isDirectory()) {
if (!hasNativeCode && entry.getName().startsWith("lib")) {
hasNativeCode = true;
}
continue;
}
String entryName = entry.getName();
if (entryName.startsWith("lib/")) {
hasNativeCode = true;
}
if (! (entryName.startsWith(apkSharedLibraryPrefix)
&& entryName.endsWith(sharedLibrarySuffix))) {
continue;
@@ -2476,6 +2476,9 @@ class PackageManagerService extends IPackageManager.Stub {
|| (!FileUtils.isFilenameSafe(new File(libFileName)))) {
continue;
}
installedNativeCode = true;
String sharedLibraryFilePath = sharedLibraryDir.getPath() +
File.separator + libFileName;
File sharedLibraryFile = new File(sharedLibraryFilePath);
@@ -2487,19 +2490,23 @@ class PackageManagerService extends IPackageManager.Stub {
}
if (mInstaller == null) {
sharedLibraryDir.mkdir();
createdSharedLib = true;
}
cacheSharedLibLI(pkg, zipFile, entry, sharedLibraryDir,
sharedLibraryFile);
}
}
} catch (IOException e) {
Log.e(TAG, "Failed to cache package shared libs", e);
if(createdSharedLib) {
sharedLibraryDir.delete();
}
throw e;
Log.w(TAG, "Failed to cache package shared libs", e);
return PackageManager.INSTALL_FAILED_INSUFFICIENT_STORAGE;
}
if (hasNativeCode && !installedNativeCode) {
Log.w(TAG, "Install failed: .apk has native code but none for arch "
+ Build.CPU_ABI);
return PackageManager.INSTALL_FAILED_CPU_ABI_INCOMPATIBLE;
}
return PackageManager.INSTALL_SUCCEEDED;
}
private void cacheSharedLibLI(PackageParser.Package pkg,