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

Commit 4edd1b49 authored by Logan Chien's avatar Logan Chien Committed by android-build-merger
Browse files

Merge changes from topic 'move-hwc2on1' into oc-dev 

am: df8ca52d

Change-Id: I54fd4fe69160540a0f0eae3a9b6aa7a377448cd4
parents 07d92974 df8ca52d

libs/hwc2on1adapter/Android.bp

+1 −1
Original line number Original line Diff line number Diff line
@@ -14,7 +14,7 @@ 




cc_library_shared {

cc_library_shared {

    name: "libhwc2on1adapter",

    name: "libhwc2on1adapter",

    vendor_available: true,

    vendor: true,





    clang: true,

    clang: true,

    cppflags: [

    cppflags: [

libs/hwc2on1adapter/CleanSpec.mk

0 → 100644
+52 −0
Original line number Original line Diff line number Diff line 
# Copyright (C) 2017 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.

#



# If you don't need to do a full clean build but would like to touch

# a file or delete some intermediate files, add a clean step to the end

# of the list.  These steps will only be run once, if they haven't been

# run before.

#

# E.g.:

#     $(call add-clean-step, touch -c external/sqlite/sqlite3.h)

#     $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libz_intermediates)

#

# Always use "touch -c" and "rm -f" or "rm -rf" to gracefully deal with

# files that are missing or have been moved.

#

# Use $(PRODUCT_OUT) to get to the "out/target/product/blah/" directory.

# Use $(OUT_DIR) to refer to the "out" directory.

#

# If you need to re-do something that's already mentioned, just copy

# the command and add it to the bottom of the list.  E.g., if a change

# that you made last week required touching a file and a change you

# made today requires touching the same file, just copy the old

# touch step and add it to the end of the list.

#

# ************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

# ************************************************



# For example:

#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/AndroidTests_intermediates)

#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/core_intermediates)

#$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f)

#$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)



# ************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

# ************************************************

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libhwc2on1adapter_intermediates)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/libhwc2on1adapter.so)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib64/libhwc2on1adapter.so)

services/surfaceflinger/Android.mk

+0 −1
Original line number Original line Diff line number Diff line
@@ -84,7 +84,6 @@ LOCAL_SHARED_LIBRARIES := \ 
    libdl \

    libdl \

    libfmq \

    libfmq \

    libhardware \

    libhardware \

    libhwc2on1adapter \

    libhidlbase \

    libhidlbase \

    libhidltransport \

    libhidltransport \

    libhwbinder \

    libhwbinder \

services/surfaceflinger/DisplayHardware/HWComposer.cpp

+1 −3
Original line number Original line Diff line number Diff line
@@ -47,7 +47,6 @@ 
#include <log/log.h>

#include <log/log.h>





#include "HWComposer.h"

#include "HWComposer.h"

#include "hwc2on1adapter/HWC2On1Adapter.h"

#include "HWC2.h"

#include "HWC2.h"

#include "ComposerHal.h"

#include "ComposerHal.h"
@@ -61,8 +60,7 @@ namespace android { 
// ---------------------------------------------------------------------------

// ---------------------------------------------------------------------------





HWComposer::HWComposer(bool useVrComposer)

HWComposer::HWComposer(bool useVrComposer)

    : mAdapter(),

    : mHwcDevice(),

      mHwcDevice(),

      mDisplayData(2),

      mDisplayData(2),

      mFreeDisplaySlots(),

      mFreeDisplaySlots(),

      mHwcDisplaySlots(),

      mHwcDisplaySlots(),

services/surfaceflinger/DisplayHardware/HWComposer.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -58,7 +58,6 @@ class DisplayDevice; 
class Fence;

class Fence;

class FloatRect;

class FloatRect;

class GraphicBuffer;

class GraphicBuffer;

class HWC2On1Adapter;

class NativeHandle;

class NativeHandle;

class Region;

class Region;

class String8;

class String8;
@@ -205,7 +204,6 @@ private: 
        HWC2::Vsync vsyncEnabled;

        HWC2::Vsync vsyncEnabled;

    };

    };





    std::unique_ptr<HWC2On1Adapter> mAdapter;

    std::unique_ptr<HWC2::Device>   mHwcDevice;

    std::unique_ptr<HWC2::Device>   mHwcDevice;

    std::vector<DisplayData>        mDisplayData;

    std::vector<DisplayData>        mDisplayData;

    std::set<size_t>                mFreeDisplaySlots;

    std::set<size_t>                mFreeDisplaySlots;