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

Commit 561917a3 authored by Max Bires's avatar Max Bires Committed by Automerger Merge Worker
Browse files

Merge "Transitioning identity to external_libcppbor" am: 303991b3 

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

Change-Id: If6bf3acdec3a1f26781104c395f89c914a772687
parents 4ece0d71 303991b3

identity/aidl/default/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ cc_library_static { 
    ],

    static_libs: [

        "libbase",

        "libcppbor",

        "libcppbor_external",

        "libutils",

        "libsoft_attestation_cert",

        "libkeymaster_portable",
@@ -91,7 +91,7 @@ cc_binary { 
    ],

    static_libs: [

        "libbase",

        "libcppbor",

        "libcppbor_external",

        "libutils",

        "libsoft_attestation_cert",

        "libkeymaster_portable",

identity/aidl/default/common/IdentityCredential.cpp

+1 −1
Original line number Diff line number Diff line
@@ -488,7 +488,7 @@ ndk::ScopedAStatus IdentityCredential::startRetrieval( 
        }



        for (size_t n = 0; n < nsMap->size(); n++) {

            auto [nsKeyItem, nsValueItem] = (*nsMap)[n];

            auto& [nsKeyItem, nsValueItem] = (*nsMap)[n];

            const cppbor::Tstr* nsKey = nsKeyItem->asTstr();

            const cppbor::Map* nsInnerMap = nsValueItem->asMap();

            if (nsKey == nullptr || nsInnerMap == nullptr) {

identity/aidl/default/common/IdentityCredential.h

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#include <string>

#include <vector>



#include <cppbor/cppbor.h>

#include <cppbor.h>



#include "IdentityCredentialStore.h"

#include "SecureHardwareProxy.h"

identity/aidl/default/common/WritableIdentityCredential.cpp

+2 −2
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ 
#include <android-base/logging.h>

#include <android-base/stringprintf.h>



#include <cppbor/cppbor.h>

#include <cppbor/cppbor_parse.h>

#include <cppbor.h>

#include <cppbor_parse.h>



#include <utility>

identity/aidl/vts/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ cc_test { 
        "libcrypto",

    ],

    static_libs: [

        "libcppbor",

        "libcppbor_external",

        "libkeymaster_portable",

        "libpuresoftkeymasterdevice",

        "android.hardware.keymaster@4.0",