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

Commit e8df22b7 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6511878 from 513a77cf to rvc-release

Change-Id: I8e1d61066c783589625b19ad3a2bcb8080725972
parents c93b4a1e 513a77cf
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -85,8 +85,8 @@ private:
    sp<AidlServiceManager> mTheRealServiceManager;
};

static std::once_flag gSmOnce;
static sp<IServiceManager> gDefaultServiceManager;
[[clang::no_destroy]] static std::once_flag gSmOnce;
[[clang::no_destroy]] static sp<IServiceManager> gDefaultServiceManager;

sp<IServiceManager> defaultServiceManager()
{
+7 −1
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@

#include <binder/Binder.h>

#include <assert.h>

namespace android {

// ----------------------------------------------------------------------
@@ -155,7 +157,11 @@ public: \
    std::unique_ptr<I##INTERFACE> I##INTERFACE::default_impl;           \
    bool I##INTERFACE::setDefaultImpl(std::unique_ptr<I##INTERFACE> impl)\
    {                                                                   \
        if (!I##INTERFACE::default_impl && impl) {                      \
        /* Only one user of this interface can use this function     */ \
        /* at a time. This is a heuristic to detect if two different */ \
        /* users in the same process use this function.              */ \
        assert(!I##INTERFACE::default_impl);                            \
        if (impl) {                                                     \
            I##INTERFACE::default_impl = std::move(impl);               \
            return true;                                                \
        }                                                               \
+5 −0
Original line number Diff line number Diff line
@@ -27,6 +27,11 @@ cc_library {
        enabled: true,
        support_system_process: true,
    },
    apex_available: [
        "//apex_available:platform",
        "com.android.media.swcodec",
    ],
    min_sdk_version: "29",

    srcs: [
        "Gralloc4.cpp"
+5 −0
Original line number Diff line number Diff line
@@ -130,6 +130,11 @@ cc_library_shared {
cc_library_static {
    name: "libgui_bufferqueue_static",
    vendor_available: true,
    apex_available: [
        "//apex_available:platform",
        "com.android.media.swcodec",
    ],
    min_sdk_version: "29",

    cflags: [
        "-DNO_BUFFERHUB",
+8 −0
Original line number Diff line number Diff line
@@ -16,6 +16,14 @@ cc_library_static {
    name: "libmath",
    host_supported: true,
    vendor_available: true,
    apex_available: [
        "//apex_available:platform",
        "com.android.media",
        "com.android.media.swcodec",
        "com.android.neuralnetworks",
    ],
    min_sdk_version: "29",

    export_include_dirs: ["include"],
}

Loading