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

Commit ddc43e55 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove InitProperties" into main am: 04636c8f 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3215595



Change-Id: I765f86e67de469fde918d171f1ccdf239ea5c332
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 889b1b3f 04636c8f

init/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -226,7 +226,6 @@ cc_defaults { 
    ],

    whole_static_libs: [

        "libcap",

        "libcom.android.sysprop.init",

    ],

    header_libs: ["bootimg_headers"],

    proto: {

init/builtins.cpp

+0 −1
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ 
#include <map>

#include <memory>



#include <InitProperties.sysprop.h>

#include <android-base/chrono_utils.h>

#include <android-base/file.h>

#include <android-base/logging.h>

init/property_service.cpp

+0 −1
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ 
#include <thread>

#include <vector>



#include <InitProperties.sysprop.h>

#include <android-base/chrono_utils.h>

#include <android-base/file.h>

#include <android-base/logging.h>

init/reboot.cpp

+0 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ 
#include <thread>

#include <vector>



#include <InitProperties.sysprop.h>

#include <android-base/chrono_utils.h>

#include <android-base/file.h>

#include <android-base/logging.h>

init/sysprop/Android.bp

deleted100644 → 0
+0 −16
Original line number Diff line number Diff line 
package {

    // See: http://go/android-license-faq

    // A large-scale-change added 'default_applicable_licenses' to import

    // all of the 'license_kinds' from "system_core_init_license"

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["system_core_init_license"],

}



sysprop_library {

  name: "com.android.sysprop.init",

  srcs: ["InitProperties.sysprop"],

  property_owner: "Platform",

  api_packages: ["android.sysprop"],

  recovery_available: true,

}