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

Commit 59a129fd authored by Jihoon Kang's avatar Jihoon Kang
Browse files

Replace lists of aconfig modules with aconfig_declarations_group 

Currently in AconfigFlags.bp, two list of aconfig modules are being
maintained: the list of java_aconfig_library modules and the list of
aconfig_declarations modules. When a new aconfig module is being added,
a developer must modify the two lists, and there is no guarantee that
the two lists are kept in sync. In order to resolve such issue, this
change replaces the two lists with the newly introduced
aconfig_declarations_group module.

Test: m
Bug: 320492079
Merged-In: Ib32c06de4f0279a17e5c65314e984265592d004c
Change-Id: Ib32c06de4f0279a17e5c65314e984265592d004c
parent c70419af

AconfigFlags.bp

+27 −41
Original line number Diff line number Diff line
@@ -12,52 +12,36 @@ 
// See the License for the specific language governing permissions and

// limitations under the License.



aconfig_srcjars = [

aconfig_declarations_group {

    name: "framework-minus-apex-aconfig-declarations",

    java_aconfig_libraries: [

        // !!! KEEP THIS LIST ALPHABETICAL !!!

    ":aconfig_mediacodec_flags_java_lib{.generated_srcjars}",

    ":android.content.pm.flags-aconfig-java{.generated_srcjars}",

    ":android.content.res.flags-aconfig-java{.generated_srcjars}",

    ":android.crashrecovery.flags-aconfig-java{.generated_srcjars}",

    ":android.hardware.biometrics.flags-aconfig-java{.generated_srcjars}",

    ":android.media.codec-aconfig-java{.generated_srcjars}",

    ":android.media.playback.flags-aconfig-java{.generated_srcjars}",

    ":android.net.platform.flags-aconfig-java{.generated_srcjars}",

    ":android.net.vcn.flags-aconfig-java{.generated_srcjars}",

    ":android.nfc.flags-aconfig-java{.generated_srcjars}",

    ":android.os.flags-aconfig-java{.generated_srcjars}",

    ":android.security.flags-aconfig-java{.generated_srcjars}",

    ":com.android.hardware.camera2-aconfig-java{.generated_srcjars}",

    ":com.android.hardware.input-aconfig-java{.generated_srcjars}",

    ":com.android.net.thread.flags-aconfig-java{.generated_srcjars}",

    ":com.android.text.flags-aconfig-java{.generated_srcjars}",

    ":com.android.window.flags.window-aconfig-java{.generated_srcjars}",

        "aconfig_mediacodec_flags_java_lib",

        "android.content.pm.flags-aconfig-java",

        "android.content.res.flags-aconfig-java",

        "android.crashrecovery.flags-aconfig-java",

        "android.hardware.biometrics.flags-aconfig-java",

        "android.media.codec-aconfig-java",

        "android.media.playback.flags-aconfig-java",

        "android.net.platform.flags-aconfig-java",

        "android.net.vcn.flags-aconfig-java",

        "android.nfc.flags-aconfig-java",

        "android.os.flags-aconfig-java",

        "android.security.flags-aconfig-java",

        "com.android.hardware.camera2-aconfig-java",

        "com.android.hardware.input-aconfig-java",

        "com.android.net.thread.flags-aconfig-java",

        "com.android.text.flags-aconfig-java",

        "com.android.window.flags.window-aconfig-java",

        // !!! KEEP THIS LIST ALPHABETICAL !!!

]



stubs_defaults {

    name: "framework-minus-apex-aconfig-declarations",

    aconfig_declarations: [

        "android.content.pm.flags-aconfig",

        "android.content.res.flags-aconfig",

        "android.crashrecovery.flags-aconfig",

        "android.hardware.biometrics.flags-aconfig",

        "android.media.playback.flags-aconfig",

        "android.net.platform.flags-aconfig",

        "android.net.vcn.flags-aconfig",

        "android.nfc.flags-aconfig",

        "android.os.flags-aconfig",

        "android.security.flags-aconfig",

        "com.android.hardware.camera2-aconfig",

        "com.android.hardware.input.input-aconfig",

        "com.android.net.thread.flags-aconfig",

        "com.android.window.flags.window-aconfig",

        "com.android.text.flags-aconfig",

    ],

}



filegroup {

    name: "framework-minus-apex-aconfig-srcjars",

    srcs: aconfig_srcjars,

    srcs: [

        ":framework-minus-apex-aconfig-declarations{.srcjars}",

    ],

}



// Aconfig declarations and libraries for the core framework
@@ -66,7 +50,9 @@ java_defaults { 


    // Add java_aconfig_libraries to here to add them to the core framework

    // Add aconfig-annotations-lib as a dependency for the optimization

    srcs: aconfig_srcjars,

    srcs: [

        ":framework-minus-apex-aconfig-declarations{.srcjars}",

    ],

    libs: ["aconfig-annotations-lib"],

}

api/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -310,7 +310,7 @@ packages_to_document = [ 
// classpath (or sources) somehow.

stubs_defaults {

    name: "android-non-updatable-stubs-defaults",

    defaults: ["framework-minus-apex-aconfig-declarations"],

    aconfig_declarations: ["framework-minus-apex-aconfig-declarations"],

    srcs: [":android-non-updatable-stub-sources"],

    sdk_version: "none",

    system_modules: "none",