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

Commit b065c9d8 authored by Jeff Tinker's avatar Jeff Tinker
Browse files

Fix failing drm 1.0 vts tests 

The shared library path was incorrectly set based on
the drm.64bit.enabled flag. It should be set based
on whether the drm service is running as 32-bit or
64-bit.

Test: vts-tradefed run commandAndExit vts -m VtsHalDrmV1_0Target

bug:111289939
Change-Id: I388dc87bd4566211dc2901feccf1e6e1c90bfe67
parent 80abca52

drm/1.0/default/DrmFactory.cpp

+1 −1
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2016 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

drm/1.0/default/LegacyPluginPath.cpp

+11 −5
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


#include "LegacyPluginPath.h"



#include <unistd.h>



#include <cutils/properties.h>



namespace android {
@@ -24,12 +26,16 @@ namespace drm { 
namespace V1_0 {

namespace implementation {



// 64-bit DRM depends on OEM libraries that aren't

// provided for all devices. If the drm hal service

// is running as 64-bit use the 64-bit libs, otherwise

// use the 32-bit libs.

const char* getDrmPluginPath() {

    if (property_get_bool("drm.64bit.enabled", false)) {

#if defined(__LP64__)

    return "/vendor/lib64/mediadrm";

    } else {

#else

    return "/vendor/lib/mediadrm";

    }

#endif

}



}  // namespace implementation

drm/1.0/default/include/PluginLoader.h

+4 −1
Original line number Diff line number Diff line
@@ -85,6 +85,9 @@ class PluginLoader { 
                libraries.push(library);

                T* result = createFactoryFunc();

                return  result;

            } else {

                ALOGE("Failed to lookup symbol %s in library %s: %s",

                        entry, path, library->lastError());

            }

        }

        return NULL;