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

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

Merge "Convert *-developer-gsi.avbpubkey to Android.bp" into main am: 4b966aa7 

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



Change-Id: Ic70460233e8b4f20f215f52830379e14fcbe1b09
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4d53aac4 4b966aa7

rootdir/avb/Android.bp

0 → 100644
+71 −0
Original line number Diff line number Diff line 
// Copyright (C) 2024 The Android Open Source Project

//

// Licensed under the Apache License, Version 2.0 (the "License");

// you may not use this file except in compliance with the License.

// You may obtain a copy of the License at

//

//     http://www.apache.org/licenses/LICENSE-2.0

//

// Unless required by applicable law or agreed to in writing, software

// distributed under the License is distributed on an "AS IS" BASIS,

// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

// See the License for the specific language governing permissions and

// limitations under the License.



soong_config_module_type {

    name: "avb_keys_prebuilt_avb",

    module_type: "prebuilt_avb",

    config_namespace: "ANDROID",

    bool_variables: [

        "BOARD_MOVE_GSI_AVB_KEYS_TO_VENDOR_BOOT",

    ],

    properties: [

        "ramdisk",

        "vendor_ramdisk",

    ],

}



avb_keys_prebuilt_avb {

    name: "q-developer-gsi.avbpubkey",

    src: "q-developer-gsi.avbpubkey",

    soong_config_variables: {

        BOARD_MOVE_GSI_AVB_KEYS_TO_VENDOR_BOOT: {

            ramdisk: false,

            vendor_ramdisk: true,

            conditions_default: {

                ramdisk: true,

                vendor_ramdisk: false,

            },

        },

    },

}



avb_keys_prebuilt_avb {

    name: "r-developer-gsi.avbpubkey",

    src: "r-developer-gsi.avbpubkey",

    soong_config_variables: {

        BOARD_MOVE_GSI_AVB_KEYS_TO_VENDOR_BOOT: {

            ramdisk: false,

            vendor_ramdisk: true,

            conditions_default: {

                ramdisk: true,

                vendor_ramdisk: false,

            },

        },

    },

}



avb_keys_prebuilt_avb {

    name: "s-developer-gsi.avbpubkey",

    src: "s-developer-gsi.avbpubkey",

    soong_config_variables: {

        BOARD_MOVE_GSI_AVB_KEYS_TO_VENDOR_BOOT: {

            ramdisk: false,

            vendor_ramdisk: true,

            conditions_default: {

                ramdisk: true,

                vendor_ramdisk: false,

            },

        },

    },

}

rootdir/avb/Android.mk

deleted100644 → 0
+0 −56
Original line number Diff line number Diff line 
LOCAL_PATH:= $(call my-dir)



ifeq ($(BOARD_MOVE_GSI_AVB_KEYS_TO_VENDOR_BOOT),true) # AVB keys are installed to vendor ramdisk

  ifeq ($(BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT),true) # no dedicated recovery partition

    my_gsi_avb_keys_path := $(TARGET_VENDOR_RAMDISK_OUT)/first_stage_ramdisk/avb

  else # device has a dedicated recovery partition

    my_gsi_avb_keys_path := $(TARGET_VENDOR_RAMDISK_OUT)/avb

  endif

else

  ifeq ($(BOARD_USES_RECOVERY_AS_BOOT),true) # no dedicated recovery partition

    my_gsi_avb_keys_path := $(TARGET_RECOVERY_ROOT_OUT)/first_stage_ramdisk/avb

  else # device has a dedicated recovery partition

    my_gsi_avb_keys_path := $(TARGET_RAMDISK_OUT)/avb

  endif

endif



#######################################

# q-developer-gsi.avbpubkey

include $(CLEAR_VARS)



LOCAL_MODULE := q-developer-gsi.avbpubkey

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

LOCAL_LICENSE_CONDITIONS := notice

LOCAL_MODULE_CLASS := ETC

LOCAL_SRC_FILES := $(LOCAL_MODULE)

LOCAL_MODULE_PATH := $(my_gsi_avb_keys_path)



include $(BUILD_PREBUILT)



#######################################

# r-developer-gsi.avbpubkey

include $(CLEAR_VARS)



LOCAL_MODULE := r-developer-gsi.avbpubkey

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

LOCAL_LICENSE_CONDITIONS := notice

LOCAL_MODULE_CLASS := ETC

LOCAL_SRC_FILES := $(LOCAL_MODULE)

LOCAL_MODULE_PATH := $(my_gsi_avb_keys_path)



include $(BUILD_PREBUILT)



#######################################

# s-developer-gsi.avbpubkey

include $(CLEAR_VARS)



LOCAL_MODULE := s-developer-gsi.avbpubkey

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

LOCAL_LICENSE_CONDITIONS := notice

LOCAL_MODULE_CLASS := ETC

LOCAL_SRC_FILES := $(LOCAL_MODULE)

LOCAL_MODULE_PATH := $(my_gsi_avb_keys_path)



include $(BUILD_PREBUILT)



my_gsi_avb_keys_path :=