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

Commit 8cbe8f2a authored by Ted Bauer's avatar Ted Bauer Committed by Automerger Merge Worker
Browse files

Merge "Make dependencies available to ConfigInfra" into main am: cfe79677 am: ece4ab86 

Original change: https://android-review.googlesource.com/c/platform/build/+/3429006



Change-Id: I847afef75f56414d76b73df5d8a8af3adbef0d32
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c0aa44e8 ece4ab86

tools/aconfig/aconfig/Android.bp

+5 −0
Original line number Diff line number Diff line
@@ -243,6 +243,11 @@ rust_aconfig_library { 
    crate_name: "aconfig_test_rust_library",

    aconfig_declarations: "aconfig.test.flags",

    host_supported: true,

    apex_available: [

        "//apex_available:platform",

        "com.android.configinfrastructure",

    ],

    min_sdk_version: "34",

}



rust_test {

tools/aconfig/aconfig_device_paths/Android.bp

+7 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ rust_defaults { 
        "libaconfig_protos",

        "libanyhow",

        "libprotobuf",

        "libregex",

    ],

}
@@ -35,6 +34,11 @@ rust_library { 
    crate_name: "aconfig_device_paths",

    host_supported: true,

    defaults: ["libaconfig_device_paths.defaults"],

    apex_available: [

        "//apex_available:platform",

        "com.android.configinfrastructure",

    ],

    min_sdk_version: "34",

}



genrule {
@@ -54,7 +58,9 @@ java_library { 
    sdk_version: "core_platform",

    apex_available: [

        "//apex_available:platform",

        "com.android.configinfrastructure",

    ],

    min_sdk_version: "34",

}



genrule {

tools/aconfig/aconfig_flags/Android.bp

+10 −0
Original line number Diff line number Diff line
@@ -24,6 +24,11 @@ rust_library { 
        "libaconfig_flags_rust",

    ],

    host_supported: true,

    apex_available: [

        "//apex_available:platform",

        "com.android.configinfrastructure",

    ],

    min_sdk_version: "34",

}



aconfig_declarations {
@@ -38,6 +43,11 @@ rust_aconfig_library { 
    crate_name: "aconfig_flags_rust",

    aconfig_declarations: "aconfig_flags",

    host_supported: true,

    apex_available: [

        "//apex_available:platform",

        "com.android.configinfrastructure",

    ],

    min_sdk_version: "34",

}



cc_aconfig_library {

tools/aconfig/aconfig_protos/Android.bp

+10 −0
Original line number Diff line number Diff line
@@ -58,6 +58,11 @@ rust_protobuf { 
    crate_name: "aconfig_rust_proto",

    source_stem: "aconfig_rust_proto",

    host_supported: true,

    apex_available: [

        "//apex_available:platform",

        "com.android.configinfrastructure",

    ],

    min_sdk_version: "34",

}



rust_defaults {
@@ -81,6 +86,11 @@ rust_library { 
    crate_name: "aconfig_protos",

    host_supported: true,

    defaults: ["aconfig_protos.defaults"],

    apex_available: [

        "//apex_available:platform",

        "com.android.configinfrastructure",

    ],

    min_sdk_version: "34",

}



rust_test_host {

tools/aconfig/aflags/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -31,6 +31,9 @@ rust_binary { 
    name: "aflags",

    host_supported: true,

    defaults: ["aflags.defaults"],

    apex_available: [

        "//apex_available:platform",

    ],

}



rust_test_host {