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

Commit 6869c321 authored by Patrick Plunkett's avatar Patrick Plunkett Committed by Android (Google) Code Review
Browse files

Merge "Remove libdvr platform library"

parents 6d40b93e 6eadd170

libs/vr/CleanSpec.mk

0 → 100644
+52 −0
Original line number Diff line number Diff line 
# Copyright (C) 2012 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, find $(PRODUCT_OUT) -type f -name "libdvr.so" -print0 | xargs -0 rm -f)

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

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

libs/vr/libbufferhubqueue/benchmarks/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ cc_benchmark { 
        "libbase",

        "libbinder",

        "libcutils",

        "libdvr",

        "libdvr.google",

        "libgui",

        "liblog",

        "libhardware",

libs/vr/libbufferhubqueue/benchmarks/buffer_transport_benchmark.cpp

+1 −1
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ class BinderBufferTransport : public BufferTransport { 
class DvrApi {

 public:

  DvrApi() {

    handle_ = dlopen("libdvr.so", RTLD_NOW | RTLD_LOCAL);

    handle_ = dlopen("libdvr.google.so", RTLD_NOW | RTLD_LOCAL);

    CHECK(handle_);



    auto dvr_get_api =

libs/vr/libdvr/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ shared_libs = [ 
]



cc_library_shared {

    name: "libdvr",

    name: "libdvr.google",

    owner: "google",

    cflags: cflags,

    header_libs: ["libdvr_headers"],
@@ -88,7 +88,7 @@ cc_library_shared { 
// restricting function access in the shared lib makes it inconvenient to use in

// test code.

cc_library_static {

    name: "libdvr_static",

    name: "libdvr_static.google",

    owner: "google",

    cflags: cflags,

    header_libs: ["libdvr_headers"],

libs/vr/libdvr/tests/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ cc_test { 


    header_libs: ["libdvr_headers"],

    static_libs: [

        "libdvr_static",

        "libdvr_static.google",

        "libchrome",

        "libdvrcommon",

        "libdisplay",