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

Commit a18d7b17 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "aconfig: move codegen into separate module" into main

parents 5f24a209 12e593cd

tools/aconfig/src/codegen_cpp.rs→tools/aconfig/src/codegen/cpp.rs

+2 −2
Original line number Diff line number Diff line
@@ -56,12 +56,12 @@ where 
    let files = [

        FileSpec {

            name: &format!("{}.h", header),

            template: include_str!("../templates/cpp_exported_header.template"),

            template: include_str!("../../templates/cpp_exported_header.template"),

            dir: "include",

        },

        FileSpec {

            name: &format!("{}.cc", header),

            template: include_str!("../templates/cpp_source_file.template"),

            template: include_str!("../../templates/cpp_source_file.template"),

            dir: "",

        },

    ];

tools/aconfig/src/codegen_java.rs→tools/aconfig/src/codegen/java.rs

+4 −4
Original line number Diff line number Diff line
@@ -50,18 +50,18 @@ where 
        library_exported,

    };

    let mut template = TinyTemplate::new();

    template.add_template("Flags.java", include_str!("../templates/Flags.java.template"))?;

    template.add_template("Flags.java", include_str!("../../templates/Flags.java.template"))?;

    template.add_template(

        "FeatureFlagsImpl.java",

        include_str!("../templates/FeatureFlagsImpl.java.template"),

        include_str!("../../templates/FeatureFlagsImpl.java.template"),

    )?;

    template.add_template(

        "FeatureFlags.java",

        include_str!("../templates/FeatureFlags.java.template"),

        include_str!("../../templates/FeatureFlags.java.template"),

    )?;

    template.add_template(

        "FakeFeatureFlagsImpl.java",

        include_str!("../templates/FakeFeatureFlagsImpl.java.template"),

        include_str!("../../templates/FakeFeatureFlagsImpl.java.template"),

    )?;



    let path: PathBuf = package.split('.').collect();

tools/aconfig/src/codegen.rs→tools/aconfig/src/codegen/mod.rs

+4 −0
Original line number Diff line number Diff line
@@ -14,6 +14,10 @@ 
 * limitations under the License.

 */



pub mod cpp;

pub mod java;

pub mod rust;



use anyhow::{ensure, Result};



pub fn is_valid_name_ident(s: &str) -> bool {

tools/aconfig/src/codegen_rust.rs→tools/aconfig/src/codegen/rust.rs

+2 −2
Original line number Diff line number Diff line
@@ -43,8 +43,8 @@ where 
    template.add_template(

        "rust_code_gen",

        match codegen_mode {

            CodegenMode::Production => include_str!("../templates/rust_prod.template"),

            CodegenMode::Test => include_str!("../templates/rust_test.template"),

            CodegenMode::Production => include_str!("../../templates/rust_prod.template"),

            CodegenMode::Test => include_str!("../../templates/rust_test.template"),

            CodegenMode::Exported => {

                todo!("exported mode not yet supported for rust, see b/313894653.")

            }

tools/aconfig/src/commands.rs

+3 −3
Original line number Diff line number Diff line
@@ -20,9 +20,9 @@ use protobuf::Message; 
use std::io::Read;

use std::path::PathBuf;



use crate::codegen_cpp::generate_cpp_code;

use crate::codegen_java::generate_java_code;

use crate::codegen_rust::generate_rust_code;

use crate::codegen::cpp::generate_cpp_code;

use crate::codegen::java::generate_java_code;

use crate::codegen::rust::generate_rust_code;

use crate::protos::{

    ParsedFlagExt, ProtoFlagMetadata, ProtoFlagPermission, ProtoFlagState, ProtoParsedFlag,

    ProtoParsedFlags, ProtoTracepoint,