Include public rather than private headers.
Change-Id: I67c88a68eab4f6ca6cb982408d2219cbd38639a8
diff --git a/camera/Android.mk b/camera/Android.mk
index 5ecc9fe..8627e8d 100644
--- a/camera/Android.mk
+++ b/camera/Android.mk
@@ -125,7 +125,7 @@
LOCAL_SHARED_LIBRARIES+= libdl
endif
- LOCAL_CFLAGS += -include bionic/libc/kernel/common/linux/socket.h
+ LOCAL_CFLAGS += -include bionic/libc/include/sys/socket.h
LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
LOCAL_MODULE:= camera.$(TARGET_DEVICE)
diff --git a/camera/QCamera/HAL/core/Android.mk b/camera/QCamera/HAL/core/Android.mk
index 0340cd6..f8ea0aa 100755
--- a/camera/QCamera/HAL/core/Android.mk
+++ b/camera/QCamera/HAL/core/Android.mk
@@ -80,7 +80,7 @@
LOCAL_SHARED_LIBRARIES += libmmcamera_interface_badger
LOCAL_SHARED_LIBRARIES+= libgenlock libbinder
-LOCAL_CFLAGS += -include bionic/libc/kernel/common/linux/socket.h
+LOCAL_CFLAGS += -include bionic/libc/include/sys/socket.h
LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
LOCAL_MODULE:= camera_badger.$(TARGET_BOARD_PLATFORM)
diff --git a/camera/QCamera/HAL2/core/Android.mk b/camera/QCamera/HAL2/core/Android.mk
index c9b6f37..ba4ed32 100644
--- a/camera/QCamera/HAL2/core/Android.mk
+++ b/camera/QCamera/HAL2/core/Android.mk
@@ -76,7 +76,7 @@
LOCAL_SHARED_LIBRARIES += libmmcamera_interface
LOCAL_SHARED_LIBRARIES+= libgenlock libbinder libcamera_metadata
-LOCAL_CFLAGS += -include bionic/libc/kernel/common/linux/socket.h
+LOCAL_CFLAGS += -include bionic/libc/include/sys/socket.h
LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
LOCAL_MODULE:= camera.$(TARGET_BOARD_PLATFORM)
diff --git a/camera/QCamera/stack/mm-camera-interface/Android.mk b/camera/QCamera/stack/mm-camera-interface/Android.mk
index 022a30a..7710ac5 100755
--- a/camera/QCamera/stack/mm-camera-interface/Android.mk
+++ b/camera/QCamera/stack/mm-camera-interface/Android.mk
@@ -41,8 +41,8 @@
# (END) Need to remove later once dependency on jpeg removed
LOCAL_C_INCLUDES+= hardware/qcom/media/mm-core/inc
-LOCAL_CFLAGS += -include bionic/libc/kernel/common/linux/socket.h
-LOCAL_CFLAGS += -include bionic/libc/kernel/common/linux/un.h
+LOCAL_CFLAGS += -include bionic/libc/include/sys/socket.h
+LOCAL_CFLAGS += -include bionic/libc/include/sys/un.h
LOCAL_SRC_FILES := $(MM_CAM_FILES)
diff --git a/camera/mm-camera-interface/Android.mk b/camera/mm-camera-interface/Android.mk
index a3372c6..67c2a03 100644
--- a/camera/mm-camera-interface/Android.mk
+++ b/camera/mm-camera-interface/Android.mk
@@ -27,8 +27,8 @@
$(TARGET_OUT_HEADERS)/mm-still/mm-omx
LOCAL_C_INCLUDES+= hardware/qcom/media/mm-core/inc
-LOCAL_CFLAGS += -include bionic/libc/kernel/common/linux/socket.h
-LOCAL_CFLAGS += -include bionic/libc/kernel/common/linux/un.h
+LOCAL_CFLAGS += -include bionic/libc/include/sys/socket.h
+LOCAL_CFLAGS += -include bionic/libc/include/sys/un.h
LOCAL_SRC_FILES := $(MM_CAM_FILES)
