From f9b3147d428137fc82afbc6e1cef9ccdbf4b4dc2 Mon Sep 17 00:00:00 2001 From: jhenrique09 Date: Fri, 20 Dec 2019 01:15:39 +0000 Subject: [PATCH 1/2] cameraserver: Fix libcameraserver location Change-Id: I39c59065b1c4e1a1995c755ab490f23407db1da6 --- camera/cameraserver/Android.bp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/camera/cameraserver/Android.bp b/camera/cameraserver/Android.bp index ecaba3ac11..57f0b44153 100644 --- a/camera/cameraserver/Android.bp +++ b/camera/cameraserver/Android.bp @@ -18,7 +18,7 @@ cc_binary { srcs: ["main_cameraserver.cpp"], shared_libs: [ - "libcameraservice", + "//frameworks/av/services/camera/libcameraservice:libcameraservice", "liblog", "libutils", "libui", From 835651855f645401b4997d12c86e41c1e86c2621 Mon Sep 17 00:00:00 2001 From: jhenrique09 Date: Wed, 18 Dec 2019 18:32:19 +0000 Subject: [PATCH 2/2] av: Allow providing camera server and service Change-Id: I7412aa447a276ec9355288df15ade5f23e982d1b --- camera/cameraserver/Android.bp | 3 +++ services/camera/libcameraservice/Android.bp | 3 +++ 2 files changed, 6 insertions(+) diff --git a/camera/cameraserver/Android.bp b/camera/cameraserver/Android.bp index 57f0b44153..dcbfed2c31 100644 --- a/camera/cameraserver/Android.bp +++ b/camera/cameraserver/Android.bp @@ -12,6 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. +soong_namespace { +} + cc_binary { name: "cameraserver", diff --git a/services/camera/libcameraservice/Android.bp b/services/camera/libcameraservice/Android.bp index 86396d4998..6a2b706a22 100644 --- a/services/camera/libcameraservice/Android.bp +++ b/services/camera/libcameraservice/Android.bp @@ -12,6 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. +soong_namespace { +} + // // libcameraservice //