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

Commit 08a2ef23 authored by Dennis Shen's avatar Dennis Shen Committed by Automerger Merge Worker
Browse files

Merge "Deprecate cc_binary aconfigd and the controlling flag" into main am: a317e56e 

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



Change-Id: I64665b6ab8e08d889bb0bc5678e99ca55a970138
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 21bac8e3 a317e56e

target/product/base_system.mk

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
# Base modules and settings for the system partition.

PRODUCT_PACKAGES += \

    abx \

    aconfigd \

    aconfigd-system \

    adbd_system_api \

    aflags \

target/product/generic/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -381,7 +381,6 @@ android_filesystem_defaults { 


    deps: [

        "abx",

        "aconfigd",

        "aconfigd-system",

        "aflags",

        "am",

tools/aconfig/aconfig_flags/flags.aconfig

+0 −8
Original line number Diff line number Diff line
@@ -14,11 +14,3 @@ flag { 
  bug: "369808805"

  description: "When enabled, launch aconfigd from config infra module."

}
 


flag {

  name: "enable_system_aconfigd_rust"

  namespace: "core_experiments_team_internal"

  bug: "378079539"

  description: "When enabled, the aconfigd cc_binary target becomes a no-op, and the rust_binary aconfigd-system target starts up."

  is_fixed_read_only: true

}

tools/aconfig/aconfig_flags/src/lib.rs

+0 −11
Original line number Diff line number Diff line
@@ -39,11 +39,6 @@ pub mod auto_generated { 
    pub fn enable_aconfigd_from_mainline() -> bool {

        aconfig_flags_rust::enable_only_new_storage()

    }



    /// Returns the value for the enable_system_aconfigd_rust flag.

    pub fn enable_system_aconfigd_rust() -> bool {

        aconfig_flags_rust::enable_system_aconfigd_rust()

    }

}



/// Module used when building with cargo
@@ -60,10 +55,4 @@ pub mod auto_generated { 
        // Used only to enable typechecking and testing with cargo

        true

    }



    /// Returns a placeholder value for the enable_system_aconfigd_rust flag.

    pub fn enable_system_aconfigd_rust() -> bool {

        // Used only to enable typechecking and testing with cargo

        true

    }

}

tools/aconfig/aflags/src/aconfig_storage_source.rs

+1 −5
Original line number Diff line number Diff line
@@ -93,11 +93,7 @@ fn read_from_socket() -> Result<Vec<ProtoFlagQueryReturnMessage>> { 
        special_fields: SpecialFields::new(),

    };



    let socket_name = if aconfig_flags::auto_generated::enable_system_aconfigd_rust() {

        "/dev/socket/aconfigd_system"

    } else {

        "/dev/socket/aconfigd"

    };

    let socket_name = "/dev/socket/aconfigd_system";

    let mut socket = UnixStream::connect(socket_name)?;



    let message_buffer = messages.write_to_bytes()?;