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

Commit b70da7b0 authored by Zhi Dou's avatar Zhi Dou Committed by Automerger Merge Worker
Browse files

Merge "aconfig: disable export mode for generated native flag libraries" into... 

Merge "aconfig: disable export mode for generated native flag libraries" into main am: 1fdf9f22 am: 47b50017

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



Change-Id: I9fc190ee5b967e570dd0521fb1a71fd7bc42ff59
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fef8b004 47b50017

tools/aconfig/TEST_MAPPING

+10 −8
Original line number Diff line number Diff line
@@ -20,10 +20,11 @@ 
      // aconfig C++ integration tests (test mode auto-generated code)

      "name": "aconfig.test.cpp.test_mode"

    },

    {

      // aconfig C++ integration tests (exported mode auto-generated code)

      "name": "aconfig.test.cpp.exported_mode"

    },

    // TODO(327420679): Enable export mode for native flag library

    // {

    //   // aconfig C++ integration tests (exported mode auto-generated code)

    //   "name": "aconfig.test.cpp.exported_mode"

    // },

    {

      // aconfig Rust integration tests (production mode auto-generated code)

      "name": "aconfig.prod_mode.test.rust"
@@ -32,10 +33,11 @@ 
      // aconfig Rust integration tests (test mode auto-generated code)

      "name": "aconfig.test_mode.test.rust"

    },

    {

      // aconfig Rust integration tests (exported mode auto-generated code)

      "name": "aconfig.exported_mode.test.rust"

    },

    // TODO(327420679): Enable export mode for native flag library

    // {

    //   // aconfig Rust integration tests (exported mode auto-generated code)

    //   "name": "aconfig.exported_mode.test.rust"

    // },

    {

      // printflags unit tests

      "name": "printflags.test"

tools/aconfig/aconfig/Android.bp

+12 −6
Original line number Diff line number Diff line
@@ -142,12 +142,6 @@ cc_aconfig_library { 
    mode: "test",

}



cc_aconfig_library {

    name: "aconfig_test_cpp_library_exported_variant",

    aconfig_declarations: "aconfig.test.flags",

    mode: "exported",

}



cc_aconfig_library {

    name: "aconfig_test_cpp_library_force_read_only_variant",

    aconfig_declarations: "aconfig.test.flags",
@@ -184,6 +178,14 @@ cc_test { 
    test_suites: ["general-tests"],

}



// TODO(327420679): Enable export mode for native flag library

/*

cc_aconfig_library {

    name: "aconfig_test_cpp_library_exported_variant",

    aconfig_declarations: "aconfig.test.flags",

    mode: "exported",

}



cc_test {

    name: "aconfig.test.cpp.exported_mode",

    srcs: [
@@ -198,6 +200,7 @@ cc_test { 
    ],

    test_suites: ["general-tests"],

}

*/



cc_test {

    name: "aconfig.test.cpp.force_read_only_mode",
@@ -249,6 +252,8 @@ rust_test { 
    test_suites: ["general-tests"],

}



// TODO(327420679): Enable export mode for native flag library

/*

rust_aconfig_library {

    name: "libaconfig_test_rust_library_with_exported_mode",

    crate_name: "aconfig_test_rust_library",
@@ -266,6 +271,7 @@ rust_test { 
    ],

    test_suites: ["general-tests"],

}

*/



rust_aconfig_library {

    name: "libaconfig_test_rust_library_with_force_read_only_mode",

tools/aconfig/aconfig/src/commands.rs

+10 −0
Original line number Diff line number Diff line
@@ -203,6 +203,11 @@ pub fn create_java_lib(mut input: Input, codegen_mode: CodegenMode) -> Result<Ve 
}



pub fn create_cpp_lib(mut input: Input, codegen_mode: CodegenMode) -> Result<Vec<OutputFile>> {

    // TODO(327420679): Enable export mode for native flag library

    ensure!(

        codegen_mode != CodegenMode::Exported,

        "Exported mode for generated c/c++ flag library is disabled"

    );

    let parsed_flags = input.try_parse_flags()?;

    let modified_parsed_flags = modify_parsed_flags_based_on_mode(parsed_flags, codegen_mode)?;

    let Some(package) = find_unique_package(&modified_parsed_flags) else {
@@ -214,6 +219,11 @@ pub fn create_cpp_lib(mut input: Input, codegen_mode: CodegenMode) -> Result<Vec 
}



pub fn create_rust_lib(mut input: Input, codegen_mode: CodegenMode) -> Result<OutputFile> {

    // // TODO(327420679): Enable export mode for native flag library

    ensure!(

        codegen_mode != CodegenMode::Exported,

        "Exported mode for generated rust flag library is disabled"

    );

    let parsed_flags = input.try_parse_flags()?;

    let modified_parsed_flags = modify_parsed_flags_based_on_mode(parsed_flags, codegen_mode)?;

    let Some(package) = find_unique_package(&modified_parsed_flags) else {