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

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

Merge "Convert hardware/interfaces/keymaster/3.0/default/Android.mk to... 

Merge "Convert hardware/interfaces/keymaster/3.0/default/Android.mk to Android.bp" into main am: ab18a3b5 am: ad6f0eab

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3135574



Change-Id: I8f6e8b6d106a73250c618467a985f9910959c31a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 551051fc ad6f0eab

keymaster/3.0/default/Android.bp

0 → 100644
+57 −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.



package {

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

    default_applicable_licenses: [

        "hardware_interfaces_license",

    ],

}



cc_library_shared {

    name: "android.hardware.keymaster@3.0-impl",

    proprietary: true,

    relative_install_path: "hw",

    srcs: ["KeymasterDevice.cpp"],

    shared_libs: [

        "android.hardware.keymaster@3.0",

        "libcrypto",

        "libhardware",

        "libhidlbase",

        "libkeymaster_portable",

        "libkeymaster3device",

        "liblog",

        "libpuresoftkeymasterdevice",

        "libsoftkeymasterdevice",

        "libutils",

    ],

}



cc_binary {

    name: "android.hardware.keymaster@3.0-service",

    relative_install_path: "hw",

    proprietary: true,

    init_rc: ["android.hardware.keymaster@3.0-service.rc"],

    srcs: ["service.cpp"],

    shared_libs: [

        "android.hardware.keymaster@3.0",

        "libbase",

        "libcutils",

        "libdl",

        "libhardware",

        "libhidlbase",

        "liblog",

        "libutils",

    ],

}

keymaster/3.0/default/Android.mk

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



include $(CLEAR_VARS)

LOCAL_MODULE := android.hardware.keymaster@3.0-impl

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

LOCAL_LICENSE_CONDITIONS := notice

LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../NOTICE

LOCAL_PROPRIETARY_MODULE := true

LOCAL_MODULE_RELATIVE_PATH := hw

LOCAL_SRC_FILES := \

    KeymasterDevice.cpp \



LOCAL_SHARED_LIBRARIES := \

    liblog \

    libsoftkeymasterdevice \

    libcrypto \

    libkeymaster_portable \

    libpuresoftkeymasterdevice \

    libkeymaster3device \

    libhidlbase \

    libutils \

    libhardware \

    android.hardware.keymaster@3.0



include $(BUILD_SHARED_LIBRARY)



include $(CLEAR_VARS)

LOCAL_MODULE_RELATIVE_PATH := hw

LOCAL_PROPRIETARY_MODULE := true

LOCAL_MODULE := android.hardware.keymaster@3.0-service

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

LOCAL_LICENSE_CONDITIONS := notice

LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../NOTICE

LOCAL_INIT_RC := android.hardware.keymaster@3.0-service.rc

LOCAL_SRC_FILES := \

    service.cpp



LOCAL_SHARED_LIBRARIES := \

    liblog \

    libcutils \

    libdl \

    libbase \

    libutils \

    libhardware \

    libhidlbase \

    android.hardware.keymaster@3.0



include $(BUILD_EXECUTABLE)