Merge changes from topic "hwcomposer-cleanup"

// Copyright 2010 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.

cc_library_shared {

    name: "libhwc2on1adapter",

    vendor: true,

    clang: true,

    cflags: [

        "-Wall",

        "-Werror",

        "-Wno-user-defined-warnings",

    ],

    cppflags: [

        "-Weverything",

        "-Wunused",

        "-Wunreachable-code",

        // The static constructors and destructors in this library have not been noted to

        // introduce significant overheads

        "-Wno-exit-time-destructors",

        "-Wno-global-constructors",

        // We only care about compiling as C++14

        "-Wno-c++98-compat-pedantic",

        // android/sensors.h uses nested anonymous unions and anonymous structs

        "-Wno-nested-anon-types",

        "-Wno-gnu-anonymous-struct",

        // Don't warn about struct padding

        "-Wno-padded",

        // hwcomposer2.h features switch covering all cases.

        "-Wno-covered-switch-default",

        // hwcomposer.h features zero size array.

        "-Wno-zero-length-array",

        // Disabling warning specific to hwc2on1adapter code

        "-Wno-double-promotion",

        "-Wno-sign-conversion",

        "-Wno-switch-enum",

        "-Wno-float-equal",

        "-Wno-shorten-64-to-32",

        "-Wno-sign-compare",

        "-Wno-missing-prototypes",

    ],

    srcs: [

        "HWC2On1Adapter.cpp",

        "MiniFence.cpp",

    ],

    shared_libs: [

        "libutils",

        "libcutils",

        "liblog",

        "libhardware",

    ],

    export_include_dirs: ["include"],

    export_shared_lib_headers: ["libutils"],

}

# 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)

/*

 * 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.

 */

#include "hwc2on1adapter/MiniFence.h"

#include <unistd.h>

namespace android {

const sp<MiniFence> MiniFence::NO_FENCE = sp<MiniFence>(new MiniFence);

MiniFence::MiniFence() :

    mFenceFd(-1) {

}

MiniFence::MiniFence(int fenceFd) :

    mFenceFd(fenceFd) {

}

MiniFence::~MiniFence() {

    if (mFenceFd != -1) {

        close(mFenceFd);

    }

}

int MiniFence::dup() const {

    return ::dup(mFenceFd);

}

}