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

Commit 2e122f0b authored by Zach Johnson's avatar Zach Johnson Committed by Automerger Merge Worker
Browse files

Merge changes I7393adfc,Ibbce98d9,I6afb1930 am: 19113b6b am: 27c9f1b5 am: 34fbd5a3 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1522138

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I43c77fce9d6a81682e302a2a1e1c859677f98273
parents 4b937595 34fbd5a3

system/gd/rust/common/Android.bp

+24 −0
Original line number Diff line number Diff line
@@ -16,6 +16,10 @@ rust_library { 
            rustlibs: [

                "libandroid_logger",

            ],

            static_libs: ["libbt_common_sys_prop_cxx"],

            shared_libs: [

                "libcutils",

            ],

        },

        host: {

            rustlibs: [
@@ -45,3 +49,23 @@ rust_test_host { 
        "libpaste",

    ],

}



genrule {

    name: "libbt_common_sys_prop_bridge_code",

    tools: ["cxxbridge"],

    cmd: "$(location cxxbridge) $(in) >> $(out)",

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

    out: ["sys_prop_generated.cc"],

}



cc_library_static {

    name: "libbt_common_sys_prop_cxx",

    defaults: ["gd_ffi_defaults"],

    local_include_dirs: ["src/ffi"],

    srcs: ["src/ffi/sys_prop.cc"],

    generated_headers: ["cxx-bridge-header"],

    generated_sources: ["libbt_common_sys_prop_bridge_code"],

    shared_libs: [

        "libcutils",

    ],

}

system/gd/rust/common/src/ffi/sys_prop.cc

0 → 100644
+20 −0
Original line number Diff line number Diff line 
#include "sys_prop.h"

#include <cutils/properties.h>



namespace bluetooth {

namespace common {

namespace sys_prop {



rust::String get(rust::Str property) {

  auto name = std::string(property.data(), property.length());

  std::array<char, PROPERTY_VALUE_MAX> value_array{0};

  auto value_len = property_get(name.c_str(), value_array.data(), nullptr);

  if (value_len <= 0) {

    value_len = 0;

  }

  return rust::String(value_array.data(), value_len);

}



}  // namespace sys_prop

}  // namespace common

}  // namespace bluetooth

system/gd/rust/common/src/ffi/sys_prop.h

0 → 100644
+12 −0
Original line number Diff line number Diff line 
#include <string>

#include "rust/cxx.h"



namespace bluetooth {

namespace common {

namespace sys_prop {



rust::String get(rust::Str property);



}

}  // namespace common

}  // namespace bluetooth

system/gd/rust/common/src/lib.rs

+3 −0
Original line number Diff line number Diff line
@@ -15,6 +15,9 @@ mod asserts; 
/// Provides runtime configured-at-startup flags

pub mod init_flags;



/// Provides runtime configured system properties. Stubbed for non-Android.

pub mod sys_prop;



/// Inits logging for Android

#[cfg(target_os = "android")]

pub fn init_logging() {

system/gd/rust/common/src/sys_prop.rs

0 → 100644
+56 −0
Original line number Diff line number Diff line 
//! System properties on Android



#[cfg(target_os = "android")]

#[cxx::bridge(namespace = bluetooth::common::sys_prop)]

mod ffi {

    extern "C" {

        include!("src/ffi/sys_prop.h");

        fn get(name: &str) -> String;

    }

}



/// Gets the value of a system property on Android

#[cfg(target_os = "android")]

pub fn get(name: &str) -> Option<String> {

    let value = ffi::get(name);



    if !value.is_empty() {

        Some(value)

    } else {

        None

    }

}



/// Fake getter for non-Android, which will always return nothing.

/// Only added so it compiles & you can conditionally using cfg!

#[cfg(not(target_os = "android"))]

pub fn get(_name: &str) -> Option<String> {

    None

}



/// Gets the specified property as a u32

pub fn get_u32(name: &str) -> Option<u32> {

    if let Some(value) = get(name) {

        value.parse().ok()

    } else {

        None

    }

}



/// Gets the specified property as a bool (logic follows libcutils/properties.cpp)

pub fn get_bool(name: &str) -> Option<bool> {

    if let Some(value) = get(name) {

        match value.as_str() {

            "0" | "n" | "no" | "false" | "off" => Some(false),

            "1" | "y" | "yes" | "true" | "on" => Some(true),

            _ => None

        }

    } else {

        None

    }

}



/// Gets whether the current build is debuggable

pub fn get_debuggable() -> bool {

    get_bool("ro.debuggable").unwrap_or(false)

}