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

Commit 171944d8 authored by Ted Bauer's avatar Ted Bauer Committed by Gerrit Code Review
Browse files

Merge "Update aconfig storage deps for CPP codegen" into main

parents 496a329b 8d20d51b

tools/aconfig/aconfig_storage_file/Android.bp

+8 −0
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ rust_library { 
        "//apex_available:anyapex",

    ],

    min_sdk_version: "29",

    vendor_available: true,

    product_available: true,

}



rust_binary_host {
@@ -54,6 +56,8 @@ rust_protobuf { 
        "//apex_available:anyapex",

    ],

    min_sdk_version: "29",

    vendor_available: true,

    product_available: true,

}



cc_library {
@@ -68,4 +72,8 @@ cc_library { 
        "//apex_available:anyapex",

    ],

    host_supported: true,

    min_sdk_version: "29",

    vendor_available: true,

    product_available: true,

    double_loadable: true,

}

tools/aconfig/aconfig_storage_read_api/Android.bp

+14 −0
Original line number Diff line number Diff line
@@ -65,7 +65,14 @@ rust_ffi_static { 
    name: "libaconfig_storage_read_api_cxx_bridge",

    crate_name: "aconfig_storage_read_api_cxx_bridge",

    host_supported: true,

    vendor_available: true,

    product_available: true,

    defaults: ["aconfig_storage_read_api.defaults"],

    apex_available: [

        "//apex_available:platform",

        "//apex_available:anyapex",

    ],

    min_sdk_version: "29",

}



// flag read api cc interface
@@ -79,14 +86,21 @@ cc_library { 
    generated_sources: ["libcxx_aconfig_storage_read_api_bridge_code"],

    whole_static_libs: ["libaconfig_storage_read_api_cxx_bridge"],

    export_include_dirs: ["include"],

    host_supported: true,

    vendor_available: true,

    product_available: true,

    static_libs: [

        "libaconfig_storage_protos_cc",

        "libprotobuf-cpp-lite",

        "libbase",

    ],

    shared_libs: [

        "liblog",

    ],

    apex_available: [

        "//apex_available:platform",

        "//apex_available:anyapex",

    ],

    min_sdk_version: "29",

    double_loadable: true,

}