diff --git a/Android.mk b/Android.mk
index c020f57..c0011a9 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,24 +1,11 @@
 ifeq ($(PRODUCT_USES_QCOM_HARDWARE), true)
 
-LIBJSON_ROOT := $(call my-dir)
+LOCAL_PATH := $(call my-dir)
+
 include $(CLEAR_VARS)
 LOCAL_MODULE := libjson
-LOCAL_PATH := $(LIBJSON_ROOT)
-LOCAL_CFLAGS := -Werror -Wno-unused-parameter
-LOCAL_COPY_HEADERS_TO := libjson/inc
-LOCAL_COPY_HEADERS := bits.h \
-		config.h \
-		debug.h \
-		linkhash.h \
-		arraylist.h \
-		json.h \
-		json_config.h \
-		json_inttypes.h \
-		json_util.h \
-		json_object.h \
-		json_tokener.h \
-		json_object_iterator.h \
-		json_c_version.h
+LOCAL_CFLAGS := -Werror -Wno-error=unused-parameter
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
 LOCAL_SRC_FILES := arraylist.c \
 		debug.c \
 		json_c_version.c \