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

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

Snap for 4548429 from e3d33876 to pi-release 

Change-Id: I6169bb0000ad24dbab9229dec69f90d1e8b39749
parents fd7ccb91 e3d33876

graphics/allocator/2.0/default/Android.bp

+8 −16
Original line number Diff line number Diff line 
cc_library_shared {

    name: "android.hardware.graphics.allocator@2.0-impl",

    defaults: ["hidl_defaults"],

    proprietary: true,

    vendor: true,

    relative_install_path: "hw",

    srcs: ["Gralloc.cpp", "Gralloc0Allocator.cpp", "Gralloc1Allocator.cpp"],

    cppflags: ["-Wall", "-Wextra"],

    srcs: ["passthrough.cpp"],

    static_libs: [

        "android.hardware.graphics.allocator@2.0-passthrough",

    ],

    header_libs: [

        "android.hardware.graphics.allocator@2.0-hal",

    ],

    shared_libs: [

        "android.hardware.graphics.allocator@2.0",

        "libbase",
@@ -15,9 +20,6 @@ cc_library_shared { 
        "liblog",

        "libutils",

    ],

    header_libs: [

        "libgrallocmapperincludes",

    ],

}



cc_binary {
@@ -36,13 +38,3 @@ cc_binary { 
        "libutils",

    ],

}
 


cc_library_static {

    name: "libgralloc1-adapter",

    defaults: ["hidl_defaults"],

    srcs: ["gralloc1-adapter.cpp", "Gralloc1On0Adapter.cpp"],

    include_dirs: ["system/core/libsync/include"],

    cflags: ["-Wall", "-Wextra"],

    export_include_dirs: ["."],

    whole_static_libs: ["libgrallocusage"],

}

graphics/allocator/2.0/default/Gralloc.h→graphics/allocator/2.0/default/passthrough.cpp

+6 −19
Original line number Diff line number Diff line
@@ -14,25 +14,12 @@ 
 * limitations under the License.

 */



#ifndef ANDROID_HARDWARE_GRAPHICS_ALLOCATOR_V2_0_GRALLOC_H

#define ANDROID_HARDWARE_GRAPHICS_ALLOCATOR_V2_0_GRALLOC_H



#include <allocator-passthrough/2.0/GrallocLoader.h>

#include <android/hardware/graphics/allocator/2.0/IAllocator.h>



namespace android {

namespace hardware {

namespace graphics {

namespace allocator {

namespace V2_0 {

namespace implementation {



extern "C" IAllocator* HIDL_FETCH_IAllocator(const char* name);



} // namespace implementation

} // namespace V2_0

} // namespace allocator

} // namespace graphics

} // namespace hardware

} // namespace android

using android::hardware::graphics::allocator::V2_0::IAllocator;

using android::hardware::graphics::allocator::V2_0::passthrough::GrallocLoader;



#endif // ANDROID_HARDWARE_GRAPHICS_ALLOCATOR_V2_0_GRALLOC_H
 
extern "C" IAllocator* HIDL_FETCH_IAllocator(const char* /* name */) {

    return GrallocLoader::load();

}

graphics/allocator/2.0/default/service.cpp

+1 −1
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ 


#include <hidl/LegacySupport.h>



using android::hardware::graphics::allocator::V2_0::IAllocator;

using android::hardware::defaultPassthroughServiceImplementation;

using android::hardware::graphics::allocator::V2_0::IAllocator;



int main() {

    return defaultPassthroughServiceImplementation<IAllocator>(4);

graphics/allocator/2.0/utils/OWNERS

0 → 100644
+4 −0
Original line number Diff line number Diff line 
# Graphics team

jessehall@google.com

olv@google.com

stoza@google.com

graphics/allocator/2.0/utils/gralloc1-adapter/Android.bp

0 → 100644
+10 −0
Original line number Diff line number Diff line 
cc_library_static {

    name: "libgralloc1-adapter",

    defaults: ["hidl_defaults"],

    vendor: true,

    srcs: ["gralloc1-adapter.cpp", "Gralloc1On0Adapter.cpp"],

    include_dirs: ["system/core/libsync/include"],

    export_include_dirs: ["."],

    whole_static_libs: ["libgrallocusage"],

    shared_libs: ["libhardware", "liblog"],

}