diff --git a/camera/cameraserver/Android.bp b/camera/cameraserver/Android.bp
index ecaba3ac111..dcbfed2c318 100644
--- a/camera/cameraserver/Android.bp
+++ b/camera/cameraserver/Android.bp
@@ -12,13 +12,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+soong_namespace {
+}
+
 cc_binary {
     name: "cameraserver",
 
     srcs: ["main_cameraserver.cpp"],
 
     shared_libs: [
-        "libcameraservice",
+        "//frameworks/av/services/camera/libcameraservice:libcameraservice",
         "liblog",
         "libutils",
         "libui",
diff --git a/services/camera/libcameraservice/Android.bp b/services/camera/libcameraservice/Android.bp
index 184a528428d..d159126bc92 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
 //