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

Commit 30512e43 authored by Ted Bauer's avatar Ted Bauer Committed by Gerrit Code Review
Browse files

Merge "aconfig: introduce new aflags CLI" into main

parents 97d0ec9b 4dbf58a1

target/product/base_system.mk

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
PRODUCT_PACKAGES += \

    abx \

    adbd_system_api \

    aflags \

    am \

    android.hidl.base-V1.0-java \

    android.hidl.manager-V1.0-java \

tools/aconfig/Cargo.toml

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ members = [ 
    "aconfig",

    "aconfig_protos",

    "aconfig_storage_file",

    "aflags",

    "printflags"

]

tools/aconfig/TEST_MAPPING

+5 −0
Original line number Diff line number Diff line
@@ -74,6 +74,11 @@ 
    {

      // aconfig_storage read api cpp integration tests

      "name": "aconfig_storage.test.cpp"

    },

    {

      // aflags CLI unit tests

      // TODO(b/326062088): add to presubmit once proven in postsubmit.

      "name": "aflags.test"

    }

  ]

}

tools/aconfig/aflags/Android.bp

0 → 100644
+29 −0
Original line number Diff line number Diff line 
package {

    default_applicable_licenses: ["Android-Apache-2.0"],

}



rust_defaults {

    name: "aflags.defaults",

    edition: "2021",

    clippy_lints: "android",

    lints: "android",

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

    rustlibs: [

        "libaconfig_protos",

        "libanyhow",

        "libclap",

        "libprotobuf",

        "libregex",

    ],

}



rust_binary {

    name: "aflags",

    defaults: ["aflags.defaults"],

}



rust_test_host {

    name: "aflags.test",

    defaults: ["aflags.defaults"],

    test_suites: ["general-tests"],

}

tools/aconfig/aflags/Cargo.toml

0 → 100644
+12 −0
Original line number Diff line number Diff line 
[package]

name = "aflags"

version = "0.1.0"

edition = "2021"



[dependencies]

anyhow = "1.0.69"

paste = "1.0.11"

clap = { version = "4", features = ["derive"] }

protobuf = "3.2.0"

regex = "1.10.3"

aconfig_protos = { path = "../aconfig_protos" }