Merge "Remove references to deleted dhcpcd" into nyc-dev
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 4c1d530..efb9b94 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -87,16 +87,22 @@
TARGET_USERIMAGES_USE_EXT4 := true
BOARD_BOOTIMAGE_PARTITION_SIZE := 33554432
-BOARD_RECOVERYIMAGE_PARTITION_SIZE := 33554432
+ifneq ($(TARGET_NO_RECOVERY),true)
+ BOARD_RECOVERYIMAGE_PARTITION_SIZE := 33554432
+endif
BOARD_SYSTEMIMAGE_PARTITION_SIZE := 3221225472
BOARD_USERDATAIMAGE_PARTITION_SIZE := 26503790080
-BOARD_CACHEIMAGE_PARTITION_SIZE := 104857600
-BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
+ifneq ($(TARGET_NO_RECOVERY),true)
+ BOARD_CACHEIMAGE_PARTITION_SIZE := 104857600
+ BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
+endif
BOARD_FLASH_BLOCK_SIZE := 131072
BOARD_HAL_STATIC_LIBRARIES := libdumpstate.angler
-TARGET_RECOVERY_FSTAB = device/huawei/angler/fstab.angler
+ifneq ($(TARGET_NO_RECOVERY),true)
+ TARGET_RECOVERY_FSTAB = device/huawei/angler/fstab.angler
+endif
TARGET_COPY_OUT_VENDOR := vendor
TARGET_RELEASETOOLS_EXTENSIONS := device/huawei/angler
diff --git a/android_filesystem_config.h b/android_filesystem_config.h
index b21ad10..eee0481 100644
--- a/android_filesystem_config.h
+++ b/android_filesystem_config.h
@@ -32,6 +32,7 @@
*/
static const struct fs_path_config android_device_files[] = {
{ 00700, AID_RADIO, AID_SHELL, (1ULL << CAP_BLOCK_SUSPEND), "system/bin/qmuxd" },
+ { 00700, AID_CAMERA, AID_SHELL, (1ULL << CAP_SYS_NICE), "vendor/bin/mm-qcamera-daemon" },
#ifdef NO_ANDROID_FILESYSTEM_CONFIG_DEVICE_DIRS
{ 00000, AID_ROOT, AID_ROOT, 0, "system/etc/fs_config_dirs" },
#endif
diff --git a/camera/QCamera2/Android.mk b/camera/QCamera2/Android.mk
index 781bd6e..be053c6 100644
--- a/camera/QCamera2/Android.mk
+++ b/camera/QCamera2/Android.mk
@@ -53,7 +53,7 @@
$(LOCAL_PATH)/stack/common \
frameworks/native/include/media/hardware \
frameworks/native/include/media/openmax \
- hardware/qcom/media/libstagefrighthw \
+ hardware/qcom/media/msm8974/libstagefrighthw \
system/media/camera/include \
$(LOCAL_PATH)/../mm-image-codec/qexif \
$(LOCAL_PATH)/../mm-image-codec/qomx_core \
diff --git a/camera/QCamera2/stack/mm-camera-interface/Android.mk b/camera/QCamera2/stack/mm-camera-interface/Android.mk
index 1fc768d..ff71773 100644
--- a/camera/QCamera2/stack/mm-camera-interface/Android.mk
+++ b/camera/QCamera2/stack/mm-camera-interface/Android.mk
@@ -37,7 +37,7 @@
LOCAL_C_INCLUDES+= $(kernel_includes)
LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps)
-LOCAL_C_INCLUDES += hardware/qcom/media/mm-core/inc
+LOCAL_C_INCLUDES += hardware/qcom/media/msm8974/mm-core/inc
ifneq (1,$(filter 1,$(shell echo "$$(( $(PLATFORM_SDK_VERSION) >= 17 ))" )))
LOCAL_CFLAGS += -include bionic/libc/kernel/common/linux/socket.h
diff --git a/device.mk b/device.mk
index 4b26a35..9e7e616 100644
--- a/device.mk
+++ b/device.mk
@@ -28,16 +28,19 @@
LOCAL_KERNEL := $(TARGET_PREBUILT_KERNEL)
endif
-PRODUCT_COPY_FILES := \
+PRODUCT_COPY_FILES += \
$(LOCAL_KERNEL):kernel
PRODUCT_COPY_FILES += \
device/huawei/angler/init.angler.rc:root/init.angler.rc \
device/huawei/angler/init.angler.usb.rc:root/init.angler.usb.rc \
- device/huawei/angler/fstab.angler:root/fstab.angler \
device/huawei/angler/ueventd.angler.rc:root/ueventd.angler.rc \
device/huawei/angler/init.angler.power.sh:system/bin/init.angler.power.sh
+ifneq ($(TARGET_NO_RECOVERY),true)
+ PRODUCT_COPY_FILES += device/huawei/angler/fstab.angler:root/fstab.angler
+endif
+
ifeq ($(TARGET_USES_CHINOOK_SENSORHUB),true)
PRODUCT_COPY_FILES += \
device/huawei/angler/init.angler.sensorhub.rc:root/init.angler.sensorhub.rc
diff --git a/sepolicy/audioserver.te b/sepolicy/audioserver.te
index 3493c22..ef9ee6c 100644
--- a/sepolicy/audioserver.te
+++ b/sepolicy/audioserver.te
@@ -1,17 +1,10 @@
binder_call(audioserver, rild)
-# send data to camera socket
-allow audioserver camera_data_file:sock_file write;
-allow audioserver camera:unix_stream_socket connectto;
-allow audioserver camera:unix_dgram_socket sendto;
-#read/write /dev/media[0-N]
-allow audioserver media_device:chr_file rw_file_perms;
-#read/write /dev/msm_audio_cal
+
userdebug_or_eng(`
allow audioserver diag_device:chr_file rw_file_perms;
')
-#read/write /dev/v4l-subdev[0-N]
-allow audioserver v41_subdev_device:chr_file rw_file_perms;
+# access for speaker calibration file
allow audioserver persist_file:dir search;
allow audioserver persist_audio_file:dir search;
allow audioserver persist_audio_file:file r_file_perms;
@@ -21,3 +14,6 @@
allow audioserver perfd_data_file:sock_file write;
allow audioserver perfd:unix_dgram_socket sendto;
allow audioserver perfd:unix_stream_socket connectto;
+
+# allow reading /sys/devices/soc0/hw_platform for acdb
+allow audioserver sysfs:file { getattr open read };
diff --git a/sepolicy/camera.te b/sepolicy/camera.te
index 079f82b..c0dc97c 100644
--- a/sepolicy/camera.te
+++ b/sepolicy/camera.te
@@ -7,6 +7,8 @@
binder_use(camera)
binder_call(camera, system_server)
+allow camera self:capability { sys_nice };
+
allow camera sensorservice_service:service_manager find;
allow camera system_server:unix_stream_socket { read write };
diff --git a/sepolicy/netmgrd.te b/sepolicy/netmgrd.te
index 7610a36..2e8e2d3 100644
--- a/sepolicy/netmgrd.te
+++ b/sepolicy/netmgrd.te
@@ -33,6 +33,7 @@
userdebug_or_eng(`
allow netmgrd shared_log_device:chr_file rw_file_perms;
+ allow netmgrd diag_device:chr_file rw_file_perms;
')
# execute toybox/toolbox
