Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe12ae09 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove enable_apache_http_legacy_preload aconfig flag" into main

parents 9b8c2e83 203c63e8

core/java/com/android/internal/os/ZygoteInit.java

+5 −7
Original line number Diff line number Diff line
@@ -421,13 +421,11 @@ public class ZygoteInit { 
                null /*declaringPackage*/, null /*dependentPackages*/, null /*dependencies*/,

                false /*isNative*/));



        if (Flags.enableApacheHttpLegacyPreload()) {

        libs.add(new SharedLibraryInfo(

                "/system/framework/org.apache.http.legacy.jar", null /*packageName*/,

                null /*codePaths*/, null /*name*/, 0 /*version*/,

                SharedLibraryInfo.TYPE_BUILTIN, null /*declaringPackage*/,

                null /*dependentPackages*/, null /*dependencies*/, false /*isNative*/));

        }



        if (Flags.enableMediaAndLocationPreload()) {

            // As these libraries are technically optional and not necessarily inherited from

core/java/com/android/internal/os/flags.aconfig

+0 −9
Original line number Diff line number Diff line
@@ -43,15 +43,6 @@ flag { 
     }

}



flag {

    name: "enable_apache_http_legacy_preload"

    namespace: "system_performance"

    description: "Enables zygote preload of non-BCP org.apache.http.legacy.jar library."

    # Fixed read-only is required as the flag is read during zygote init.

    is_fixed_read_only: true

    bug: "241474956"

}



flag {

    name: "enable_media_and_location_preload"

    namespace: "system_performance"