diff options
| author | Amit Pundir <amit.pundir@linaro.org> | 2014-07-17 20:47:05 +0530 |
|---|---|---|
| committer | Amit Pundir <amit.pundir@linaro.org> | 2014-08-13 12:07:20 +0530 |
| commit | 74fbc9d526ee6b6b1b259291dd5097e15982b9fe (patch) | |
| tree | 957a725017affd85f8e3ac43ce22629b85e3cc0a | |
| parent | f727c9068cfebc076da4efb7fb2c201433d2d49f (diff) | |
| download | base-74fbc9d526ee6b6b1b259291dd5097e15982b9fe.tar.gz | |
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 <marcus.oakland@arm.com>
Change-Id: I799c9db35caf576e8d07e80153c3e7698622230f
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
| -rw-r--r-- | packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java | 10 | ||||
| -rwxr-xr-x | services/java/com/android/server/pm/PackageManagerService.java | 9 |
2 files changed, 0 insertions, 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 ed65e40ad67d..ae6099570775 100755 --- a/services/java/com/android/server/pm/PackageManagerService.java +++ b/services/java/com/android/server/pm/PackageManagerService.java @@ -5077,10 +5077,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); @@ -8822,11 +8818,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) { |