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

Commit 4e3f9c1d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Force vrhwc/wm to report the native resolution"

parents a34ed639 e77dce28

cmds/vr/pose/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ sourceFiles := \ 


staticLibraries := \

  libdvrcommon \

  libsensor \

  libvrsensor \

  libpdx_default_transport \



sharedLibraries := \

libs/vr/libbufferhub/Android.bp

0 → 100644
+58 −0
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

//

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



sourceFiles = [

    "buffer_hub_client.cpp",

    "buffer_hub_rpc.cpp",

    "ion_buffer.cpp",

]



localIncludeFiles = [

    "include",

]



staticLibraries = [

    "libdvrcommon",

    "libpdx_default_transport",

]



sharedLibraries = [

    "libbase",

    "libcutils",

    "libhardware",

    "liblog",

    "libui",

    "libutils",

]



cc_library {

    srcs: sourceFiles,

    cflags: [

        "-DLOG_TAG=\"libbufferhub\"",

        "-DTRACE=0"

    ],

    export_include_dirs: localIncludeFiles,

    static_libs: staticLibraries,

    shared_libs: sharedLibraries,

    name: "libbufferhub",

}



cc_test {

    tags: ["optional"],

    srcs: ["bufferhub_tests.cpp"],

    static_libs: ["libbufferhub"] + staticLibraries,

    shared_libs: sharedLibraries,

    name: "bufferhub_tests",

}

libs/vr/libbufferhub/Android.mk

deleted100644 → 0
+0 −56
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

#

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



LOCAL_PATH := $(call my-dir)



sourceFiles := \

	buffer_hub_client.cpp \

	buffer_hub_rpc.cpp \

	ion_buffer.cpp



includeFiles := \

	$(LOCAL_PATH)/include



staticLibraries := \

	libdvrcommon \

	libpdx_default_transport \



sharedLibraries := \

	libbase \

	libcutils \

	libhardware \

	liblog \

	libui \

	libutils



include $(CLEAR_VARS)

LOCAL_SRC_FILES := $(sourceFiles)

LOCAL_C_INCLUDES := $(includeFiles)

LOCAL_CFLAGS := -DLOG_TAG=\"libbufferhub\"

LOCAL_CFLAGS += -DTRACE=0

LOCAL_EXPORT_C_INCLUDE_DIRS := $(includeFiles)

LOCAL_STATIC_LIBRARIES := $(staticLibraries)

LOCAL_SHARED_LIBRARIES := $(sharedLibraries)

LOCAL_MODULE := libbufferhub

include $(BUILD_STATIC_LIBRARY)



include $(CLEAR_VARS)

LOCAL_MODULE_TAGS := optional

LOCAL_SRC_FILES := bufferhub_tests.cpp

LOCAL_STATIC_LIBRARIES := libbufferhub $(staticLibraries)

LOCAL_SHARED_LIBRARIES := $(sharedLibraries)

LOCAL_MODULE := bufferhub_tests

include $(BUILD_NATIVE_TEST)



include $(call all-makefiles-under,$(LOCAL_PATH))

libs/vr/libbufferhubqueue/Android.bp

0 → 100644
+51 −0
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

//

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



sourceFiles = [

    "buffer_hub_queue_client.cpp",

    "buffer_hub_queue_core.cpp",

    "buffer_hub_queue_consumer.cpp",

    "buffer_hub_queue_producer.cpp",

]



includeFiles = [

    "include",

]



staticLibraries = [

    "libbufferhub",

    "libdvrcommon",

    "libpdx_default_transport",

]



sharedLibraries = [

    "libbase",

    "libbinder",

    "libcutils",

    "libhardware",

    "liblog",

    "libui",

    "libutils",

    "libgui",

]



cc_library {

    name: "libbufferhubqueue",

    cflags = [ "-DLOGTAG=\"libbufferhubqueue\"" ],

    srcs: sourceFiles,

    export_include_dirs: includeFiles,

    static_libs: staticLibraries,

    shared_libs: sharedLibraries,

}

libs/vr/libbufferhubqueue/Android.mk

deleted100644 → 0
+0 −51
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

#

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



LOCAL_PATH := $(call my-dir)



sourceFiles := \

	buffer_hub_queue_client.cpp \

	buffer_hub_queue_core.cpp \

	buffer_hub_queue_consumer.cpp \

	buffer_hub_queue_producer.cpp \



includeFiles := \

	$(LOCAL_PATH)/include



staticLibraries := \

	libbufferhub \

	libdvrcommon \

	libpdx_default_transport \



sharedLibraries := \

	libbase \

	libbinder \

	libcutils \

	libhardware \

	liblog \

	libui \

	libutils \

        libgui \



include $(CLEAR_VARS)

LOCAL_SRC_FILES := $(sourceFiles)

LOCAL_C_INCLUDES := $(includeFiles)

LOCAL_CFLAGS := -DLOG_TAG=\"libbufferhubqueue\"

LOCAL_EXPORT_C_INCLUDE_DIRS := $(includeFiles)

LOCAL_STATIC_LIBRARIES := $(staticLibraries)

LOCAL_SHARED_LIBRARIES := $(sharedLibraries)

LOCAL_MODULE := libbufferhubqueue

include $(BUILD_STATIC_LIBRARY)



include $(call all-makefiles-under,$(LOCAL_PATH))