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

Commit 4092524c authored by Hung Nguyen's avatar Hung Nguyen
Browse files

Remove aconfigd's dependency on libtempfile 

libtempfile is only used for testing in aconfigd so it should be removed
to save some memory for both aconfigd and mmd.

Bug: 404614990
Test: atest build/make/tools/aconfig
Test: manually verify libtempfile.dylib.so doesn't show up in
aconfigd-system showmap anymore

Change-Id: I7d3e20e24295a10c0f5f96071e6c7197bddee5b2
parent bad6bf3a

tools/aconfig/aconfig/Android.bp

+4 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ rust_defaults { 
    ],

    rustlibs: [

        "libaconfig_protos",

        "libaconfig_storage_file",

        "libanyhow",

        "libclap",

        "libitertools",
@@ -28,6 +27,9 @@ rust_defaults { 
rust_binary_host {

    name: "aconfig",

    defaults: ["aconfig.defaults"],

    rustlibs: [

        "libaconfig_storage_file",

    ],

}



rust_test_host {
@@ -35,6 +37,7 @@ rust_test_host { 
    defaults: ["aconfig.defaults"],

    rustlibs: [

        "libitertools",

        "libaconfig_storage_file_with_test_utils",

    ],

    test_suites: ["general-tests"],

}

tools/aconfig/aconfig_storage_file/Android.bp

+17 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ rust_defaults { 
    rustlibs: [

        "libanyhow",

        "libthiserror",

        "libtempfile",

        "libprotobuf",

        "libclap",

        "libcxx",
@@ -33,6 +32,20 @@ rust_library { 
    product_available: true,

}



rust_library {

    name: "libaconfig_storage_file_with_test_utils",

    crate_name: "aconfig_storage_file",

    features: [

        "test_utils",

    ],

    host_supported: true,

    defaults: ["aconfig_storage_file.defaults"],

    srcs: ["src/lib.rs"],

    rustlibs: [

        "libtempfile",

    ],

}



rust_binary_host {

    name: "aconfig-storage",

    defaults: ["aconfig_storage_file.defaults"],
@@ -48,6 +61,9 @@ rust_test_host { 
    test_suites: ["general-tests"],

    defaults: ["aconfig_storage_file.defaults"],

    srcs: ["src/lib.rs"],

    rustlibs: [

        "libtempfile",

    ],

}



rust_protobuf {

tools/aconfig/aconfig_storage_file/src/lib.rs

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ pub mod flag_value; 
pub mod package_table;

pub mod protos;

pub mod sip_hasher13;

#[cfg(any(test, feature = "test_utils"))]

pub mod test_utils;



use anyhow::anyhow;

tools/aconfig/aconfig_storage_file/src/protos.rs

+0 −9
Original line number Diff line number Diff line
@@ -50,8 +50,6 @@ pub use auto_generated::*; 


use anyhow::Result;

use protobuf::Message;

use std::io::Write;

use tempfile::NamedTempFile;



pub mod storage_record_pb {

    use super::*;
@@ -90,13 +88,6 @@ pub mod storage_record_pb { 
        storage_files.write_to_vec(&mut binary_proto)?;

        Ok(binary_proto)

    }



    pub fn write_proto_to_temp_file(text_proto: &str) -> Result<NamedTempFile> {

        let bytes = get_binary_proto_from_text_proto(text_proto).unwrap();

        let mut file = NamedTempFile::new()?;

        let _ = file.write_all(&bytes);

        Ok(file)

    }

}



#[cfg(test)]

tools/aconfig/aconfig_storage_read_api/Android.bp

+23 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ rust_defaults { 
        "libmemmap2",

        "libcxx",

        "libthiserror",

        "libaconfig_storage_file",

    ],

}
@@ -21,6 +20,9 @@ rust_library { 
    crate_name: "aconfig_storage_read_api",

    host_supported: true,

    defaults: ["aconfig_storage_read_api.defaults"],

    rustlibs: [

        "libaconfig_storage_file",

    ],

    apex_available: [

        "//apex_available:platform",

        "//apex_available:anyapex",
@@ -28,12 +30,29 @@ rust_library { 
    min_sdk_version: "29",

}



rust_library {

    name: "libaconfig_storage_read_api_with_test_utils",

    crate_name: "aconfig_storage_read_api",

    host_supported: true,

    defaults: ["aconfig_storage_read_api.defaults"],

    rustlibs: [

        "libaconfig_storage_file_with_test_utils",

    ],

    apex_available: [

        "//apex_available:platform",

        "//apex_available:anyapex",

    ],

    min_sdk_version: "29",

}





rust_test_host {

    name: "aconfig_storage_read_api.test",

    test_suites: ["general-tests"],

    defaults: ["aconfig_storage_read_api.defaults"],

    rustlibs: [

        "librand",

        "libaconfig_storage_file_with_test_utils",

    ],

    data: [

        "tests/data/v1/package_v1.map",
@@ -69,6 +88,9 @@ rust_ffi_static { 
    vendor_available: true,

    product_available: true,

    defaults: ["aconfig_storage_read_api.defaults"],

    rustlibs: [

        "libaconfig_storage_file",

    ],

    apex_available: [

        "//apex_available:platform",

        "//apex_available:anyapex",