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

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

Merge "Convert `init_vendor` to Android.bp" into main am: bc1fac51 

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



Change-Id: I510c6bf13ee46646117c3e76d316f80d88f2560b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 31bb2f5a bc1fac51

init/Android.bp

+21 −1
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ libinit_cc_defaults { 
        },

        release_write_appcompat_override_system_properties: {

            cflags: ["-DWRITE_APPCOMPAT_OVERRIDE_SYSTEM_PROPERTIES"],

        }

        },

    },

    static_libs: [

        "libavb",
@@ -663,3 +663,23 @@ sh_binary { 
    src: "extra_free_kbytes.sh",

    filename_from_src: true,

}



soong_config_module_type {

    name: "board_use_recovery_as_boot_phony",

    module_type: "phony",

    config_namespace: "ANDROID",

    bool_variables: ["BOARD_USES_RECOVERY_AS_BOOT"],

    properties: ["required"],

}



board_use_recovery_as_boot_phony {

    name: "init_vendor",

    soong_config_variables: {

        BOARD_USES_RECOVERY_AS_BOOT: {

            required: [],

            conditions_default: {

                required: ["init_first_stage"],

            },

        },

    },

}

init/Android.mk

deleted100644 → 0
+0 −16
Original line number Diff line number Diff line 
# Copyright 2005 The Android Open Source Project



LOCAL_PATH:= $(call my-dir)



include $(CLEAR_VARS)



LOCAL_MODULE := init_vendor

LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0

LOCAL_LICENSE_CONDITIONS := notice

LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE

ifneq ($(BOARD_USES_RECOVERY_AS_BOOT),true)

LOCAL_REQUIRED_MODULES := \

   init_first_stage \



endif  # BOARD_USES_RECOVERY_AS_BOOT

include $(BUILD_PHONY_PACKAGE)