diff --git a/Android.mk b/Android.mk
index ddf51cb..8002c0b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,24 +1,23 @@
-LOCAL_PATH := $(call my-dir)
-LIBCAMERA_BUILD := nexus
-include $(call all-subdir-makefiles)
+ifeq ($(BOARD_USES_QCOM_HARDWARE),true)
+	LOCAL_PATH := $(call my-dir)
+	include $(call all-subdir-makefiles)
 
-include $(CLEAR_VARS)
+	include $(CLEAR_VARS)
 
-LOCAL_C_FLAGS        += -O3
-LOCAL_MODULE_TAGS    := optional
-LOCAL_MODULE_PATH    := $(TARGET_OUT_SHARED_LIBRARIES)/hw
-LOCAL_MODULE         := camera.$(TARGET_BOARD_PLATFORM)
-LOCAL_SRC_FILES      := cameraHal.cpp
-LOCAL_PRELINK_MODULE := false
-CAMERA_LIB           := camera-inc
+	LOCAL_C_FLAGS        += -O3
+	LOCAL_MODULE_TAGS    := optional
+	LOCAL_MODULE_PATH    := $(TARGET_OUT_SHARED_LIBRARIES)/hw
+	LOCAL_MODULE         := camera.$(TARGET_BOARD_PLATFORM)
 
-ifeq ($(LIBCAMERA_BUILD),nexus)
-CAMERA_LIB := camera-nexus
+	LOCAL_SRC_FILES      := cameraHal.cpp
+
+	TARGET_GLOBAL_LD_DIRS  += -L$(LOCAL_PATH)
+	LOCAL_SHARED_LIBRARIES := liblog libdl libutils libcamera_client libbinder libcutils libhardware libui
+	LOCAL_SHARED_LIBRARIES += libcamera
+	LOCAL_C_INCLUDES       := frameworks/base/services/ frameworks/base/include
+	LOCAL_C_INCLUDES       += hardware/libhardware/include/ hardware
+
+	LOCAL_PRELINK_MODULE := false
+
+	include $(BUILD_SHARED_LIBRARY)
 endif
-
-TARGET_GLOBAL_LD_DIRS  += -L$(LOCAL_PATH) -l${CAMERA_LIB}
-LOCAL_SHARED_LIBRARIES := liblog libdl libutils libcamera_client libbinder libcutils libhardware libui
-LOCAL_C_INCLUDES       := frameworks/base/services/ frameworks/base/include
-LOCAL_C_INCLUDES       += hardware/libhardware/include/ hardware
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/libcamera-nexus.so b/libcamera-nexus.so
deleted file mode 100644
index 71432a9..0000000
Binary files a/libcamera-nexus.so and /dev/null differ