diff options
| author | Amit Pundir <amit.pundir@linaro.org> | 2014-07-22 18:25:49 +0000 |
|---|---|---|
| committer | Linaro Android Code Review <android-review@review.linaro.org> | 2014-07-22 18:25:49 +0000 |
| commit | 52392fcc7ec3d9e921991b983970c407d46eb80f (patch) | |
| tree | b156382e8dbfa5b4820c49dfb5499d0506a318ac | |
| parent | 7e6999cfad753fd5f97bb9cf25d355066613f150 (diff) | |
| parent | 0e0734af013a7bb3e2f52745d1310e5acf1da89e (diff) | |
| download | base-linaro-armv8-14.07.tar.gz | |
Merge "Enable 64bit abi support for CtsTestStubs" into linaro-armv8-14.07linaro-armv8-14.07
| -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 ccd649450b67..476e7f75a20a 100755 --- a/services/java/com/android/server/pm/PackageManagerService.java +++ b/services/java/com/android/server/pm/PackageManagerService.java @@ -5030,10 +5030,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); @@ -8774,11 +8770,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) { |