diff --git a/camera/Android.mk b/camera/Android.mk
index b66105b..a17ad1a 100644
--- a/camera/Android.mk
+++ b/camera/Android.mk
@@ -1,6 +1,9 @@
-LOCAL_PATH:= $(call my-dir)
+CAMERA_CLIENT_LOCAL_PATH:= $(call my-dir)
+include $(call all-subdir-makefiles)
 include $(CLEAR_VARS)
 
+LOCAL_PATH := $(CAMERA_CLIENT_LOCAL_PATH)
+
 LOCAL_SRC_FILES:= \
 	Camera.cpp \
 	CameraMetadata.cpp \
@@ -21,7 +24,7 @@
 	libcamera_metadata \
 
 LOCAL_C_INCLUDES += \
-    system/media/camera/include
+	system/media/camera/include \
 
 LOCAL_MODULE:= libcamera_client