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

Merge "Include OrgApacheHttpLegacyUpdater unconditionally"

Browse Source 
am: 87c1081c42

Change-Id: I724fa0b8b997aa58ce444aa8a929f47af665abed
This commit is contained in:
Paul Duffin
2019-01-24 03:32:25 -08:00
committed by android-build-merger
parent ff4106fc42 87c1081c42
commit 34269e4b74
4 changed files with 8 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/content/pm/OrgApacheHttpLegacyUpdater.java
View File

@@ -25,12 +25,6 @@ import com.android.internal.annotations.VisibleForTesting;
* Updates a package to ensure that if it targets < P that the org.apache.http.legacy library is
* included by default.
*
* <p>This is separated out so that it can be conditionally included at build time depending on
* whether org.apache.http.legacy is on the bootclasspath or not. In order to include this at
* build time, and remove org.apache.http.legacy from the bootclasspath pass
* REMOVE_OAHL_FROM_BCP=true on the build command line, otherwise this class will not be included
* and the
*
* @hide
*/
@VisibleForTesting

25
core/java/android/content/pm/PackageBackwardCompatibility.java
View File

@@ -45,13 +45,9 @@ public class PackageBackwardCompatibility extends PackageSharedLibraryUpdater {
static {
final List<PackageSharedLibraryUpdater> packageUpdaters = new ArrayList<>();
// Attempt to load and add the optional updater that will only be available when
// REMOVE_OAHL_FROM_BCP=true. If that could not be found then add the default updater that
// will remove any references to org.apache.http.library from the package so that it does
// not try and load the library when it is on the bootclasspath.
boolean bootClassPathContainsOAHL = !addOptionalUpdater(packageUpdaters,
"android.content.pm.OrgApacheHttpLegacyUpdater",
RemoveUnnecessaryOrgApacheHttpLegacyLibrary::new);
// Automatically add the org.apache.http.legacy library to the app classpath if the app
// targets < P.
packageUpdaters.add(new OrgApacheHttpLegacyUpdater());
packageUpdaters.add(new AndroidHidlUpdater());
@@ -70,7 +66,7 @@ public class PackageBackwardCompatibility extends PackageSharedLibraryUpdater {
PackageSharedLibraryUpdater[] updaterArray = packageUpdaters
.toArray(new PackageSharedLibraryUpdater[0]);
INSTANCE = new PackageBackwardCompatibility(
bootClassPathContainsOAHL, bootClassPathContainsATB, updaterArray);
bootClassPathContainsATB, updaterArray);
}
/**
@@ -116,15 +112,12 @@ public class PackageBackwardCompatibility extends PackageSharedLibraryUpdater {
return INSTANCE;
}
private final boolean mBootClassPathContainsOAHL;
private final boolean mBootClassPathContainsATB;
private final PackageSharedLibraryUpdater[] mPackageUpdaters;
public PackageBackwardCompatibility(boolean bootClassPathContainsOAHL,
public PackageBackwardCompatibility(
boolean bootClassPathContainsATB, PackageSharedLibraryUpdater[] packageUpdaters) {
this.mBootClassPathContainsOAHL = bootClassPathContainsOAHL;
this.mBootClassPathContainsATB = bootClassPathContainsATB;
this.mPackageUpdaters = packageUpdaters;
}
@@ -147,14 +140,6 @@ public class PackageBackwardCompatibility extends PackageSharedLibraryUpdater {
}
}
/**
* True if the org.apache.http.legacy is on the bootclasspath, false otherwise.
*/
@VisibleForTesting
public static boolean bootClassPathContainsOAHL() {
return INSTANCE.mBootClassPathContainsOAHL;
}
/**
* True if the android.test.base is on the bootclasspath, false otherwise.
*/