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

Commit 7d969dbe authored by Yu Liu's avatar Yu Liu Committed by Android (Google) Code Review
Browse files

Merge "Add container property to a couple more aconfig declarations" into main

parents 7b395977 aa586407

AconfigFlags.bp

+2 −0
Original line number Diff line number Diff line
@@ -379,6 +379,7 @@ cc_aconfig_library { 
aconfig_declarations {

    name: "com.android.internal.os.flags-aconfig",

    package: "com.android.internal.os",

    container: "system",

    srcs: ["core/java/com/android/internal/os/flags.aconfig"],

}
@@ -853,6 +854,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "com.android.server.contextualsearch.flags-aconfig",

    package: "com.android.server.contextualsearch.flags",

    container: "system",

    srcs: ["services/contextualsearch/flags/flags.aconfig"],

}

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

+2 −1
Original line number Diff line number Diff line 
package: "com.android.internal.os"

container: "system"



flag {

    name: "enable_apache_http_legacy_preload"