From 0a0df53e30016d8b630fa2cd4f6ca5d3df2aae1b Mon Sep 17 00:00:00 2001 From: Amit Pundir Date: Thu, 17 Jul 2014 20:47:05 +0530 Subject: Enable 64bit abi support for CtsTestStubs AOSP doesn't support 64bit ABI for CtsTestStubs.apk, so CtsTestStubs.apk fail to install while running few CTS tests. Error: INSTALL_FAILED_NO_MATCHING_ABIS This fix is suggested by Marcus Oakland Change-Id: I799c9db35caf576e8d07e80153c3e7698622230f Signed-off-by: Amit Pundir --- .../src/com/android/defcontainer/DefaultContainerService.java | 10 ---------- services/java/com/android/server/pm/PackageManagerService.java | 9 --------- 2 files changed, 19 deletions(-) diff --git a/packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java b/packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java index 16a0d35646c4..4b183070d53d 100644 --- a/packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java +++ b/packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java @@ -356,16 +356,6 @@ public class DefaultContainerService extends IntentService { String[] abiList = Build.SUPPORTED_ABIS; if (abiOverride != null) { abiList = new String[] { abiOverride }; - } else { - try { - if (Build.SUPPORTED_64_BIT_ABIS.length > 0 && - NativeLibraryHelper.hasRenderscriptBitcode(handle)) { - abiList = Build.SUPPORTED_32_BIT_ABIS; - } - } catch (IOException ioe) { - Slog.w(TAG, "Problem determining ABI for: " + codeFile.getPath()); - return null; - } } final int abi = NativeLibraryHelper.findSupportedAbi(handle, abiList); diff --git a/services/java/com/android/server/pm/PackageManagerService.java b/services/java/com/android/server/pm/PackageManagerService.java index c6f6b89fa916..1b3514cb7bea 100755 --- a/services/java/com/android/server/pm/PackageManagerService.java +++ b/services/java/com/android/server/pm/PackageManagerService.java @@ -5056,10 +5056,6 @@ public class PackageManagerService extends IPackageManager.Stub { boolean hasLegacyRenderscriptBitcode = false; if (abiOverride != null) { abiList = new String[] { abiOverride }; - } else if (Build.SUPPORTED_64_BIT_ABIS.length > 0 && - NativeLibraryHelper.hasRenderscriptBitcode(handle)) { - abiList = Build.SUPPORTED_32_BIT_ABIS; - hasLegacyRenderscriptBitcode = true; } File nativeLibraryDir = new File(pkg.applicationInfo.nativeLibraryDir); @@ -8801,11 +8797,6 @@ public class PackageManagerService extends IPackageManager.Stub { ApkHandle handle = null; try { handle = ApkHandle.create(codeFile); - if (Build.SUPPORTED_64_BIT_ABIS.length > 0 && - abiOverride == null && - NativeLibraryHelper.hasRenderscriptBitcode(handle)) { - abiList = Build.SUPPORTED_32_BIT_ABIS; - } int copyRet = copyNativeLibrariesForInternalApp(handle, nativeLibraryFile, abiList); if (copyRet < 0 && copyRet != PackageManager.NO_NATIVE_LIBRARIES) { -- cgit v1.2.3