diff options
| author | Narayan Kamath <narayan@google.com> | 2015-02-05 12:45:23 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-02-05 12:45:24 +0000 |
| commit | 3ec5f97ac5705d5fe2c7ceb7b61a4df5f18b980f (patch) | |
| tree | d7191d747f2671540d8ae267b689e0491ce9cb37 | |
| parent | de873a64c8b5751391d3947d0c799b83ac40d7a8 (diff) | |
| parent | e2d2ed49235d2f717f0aee1d2c6671b376700b62 (diff) | |
| download | frameworks_base-3ec5f97ac5705d5fe2c7ceb7b61a4df5f18b980f.zip frameworks_base-3ec5f97ac5705d5fe2c7ceb7b61a4df5f18b980f.tar.gz frameworks_base-3ec5f97ac5705d5fe2c7ceb7b61a4df5f18b980f.tar.bz2 | |
Merge "Conditionally include org.apache.http.legacy in app classpaths."
| -rw-r--r-- | core/java/android/content/pm/PackageParser.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java index b76e8c0..04777ba 100644 --- a/core/java/android/content/pm/PackageParser.java +++ b/core/java/android/content/pm/PackageParser.java @@ -2760,9 +2760,17 @@ public class PackageParser { } } + addSharedLibrariesForBackwardCompatibility(owner); + return true; } + private static void addSharedLibrariesForBackwardCompatibility(Package owner) { + if (owner.applicationInfo.targetSdkVersion <= Build.VERSION_CODES.LOLLIPOP_MR1) { + owner.usesLibraries = ArrayUtils.add(owner.usesLibraries, "org.apache.http.legacy"); + } + } + /** * Parse the {@code application} XML tree at the current parse location in a * <em>split APK</em> manifest. |