update to lt03lte kernel

This commit is contained in:
Valera1978 2017-06-20 09:51:40 +03:00
parent a79b6c22e1
commit 848a07e8af
5 changed files with 913 additions and 690 deletions

View File

@ -29,7 +29,7 @@ TARGET_SPECIFIC_HEADER_PATH := $(LOCAL_PATH)/include
TARGET_OTA_ASSERT_DEVICE := viennalte,viennaltexx
#BLOCK_BASED_OTA:= false
# BLOCK_BASED_OTA:= false
# Use Snapdragon LLVM if available on build server
TARGET_USE_SDCLANG := true
@ -44,9 +44,9 @@ BOARD_KERNEL_PAGESIZE := 2048
BOARD_KERNEL_SEPARATED_DT := true
BOARD_MKBOOTIMG_ARGS := --ramdisk_offset 0x02000000 --tags_offset 0x01E00000
BOARD_CUSTOM_BOOTIMG_MK := $(LOCAL_PATH)/mkbootimg.mk
TARGET_KERNEL_SOURCE := kernel/samsung/viennalte
TARGET_KERNEL_CONFIG := msm8974_sec_defconfig
TARGET_KERNEL_VARIANT_CONFIG := msm8974_sec_viennalteeur_cm_defconfig
TARGET_KERNEL_CONFIG := lineageos_viennalteeur_defconfig
TARGET_KERNEL_CROSS_COMPILE_PREFIX := arm-linux-androideabi-
TARGET_KERNEL_SOURCE := kernel/samsung/lt03lte
# Init
TARGET_INIT_VENDOR_LIB := libinit_msm8974
@ -62,10 +62,10 @@ BOARD_BLUETOOTH_USES_HCIATTACH_PROPERTY := false
BOARD_HAVE_BLUETOOTH_BCM := true
# Camera
TARGET_PROVIDES_CAMERA_HAL := true
#TARGET_PROVIDES_CAMERA_HAL := true
TARGET_HAS_LEGACY_CAMERA_HAL1 := true
USE_DEVICE_SPECIFIC_CAMERA := true
TARGET_NEEDS_GCC_LIBC := true
#TARGET_NEEDS_GCC_LIBC := true
# Charger
BOARD_CHARGER_SHOW_PERCENTAGE := true

View File

@ -30,9 +30,9 @@ repo init -u git://github.com/LineageOS/android.git -b cm-14.1
<?xml version="1.0" encoding="UTF-8"?>
<manifest>
<project name="Valera1978/android_device_samsung_viennalte" path="device/samsung/viennalte" remote="github" revision="cm14.0" />
<project name="Valera1978/android_kernel_samsung_viennalte" path="kernel/samsung/viennalte" remote="github" revision="cm14.0" />
<project name="Valera1978/android_vendor_samsung_viennalte" path="vendor/samsung/viennalte" remote="github" revision="cm14.0" />
<project name="Valera1978/android_device_samsung_viennalte" path="device/samsung/viennalte" remote="github" revision="cm14.0_alt" />
<project name="Valera1978/android_kernel_samsung_lt03lte" path="kernel/samsung/lt03lte" remote="github" revision="cm14.1" />
<project name="Valera1978/android_vendor_samsung_viennalte" path="vendor/samsung/viennalte" remote="github" revision="cm14.0_alt" />
<project name="LineageOS/android_external_sony_boringssl-compat" path="external/sony/boringssl-compat" remote="github" />
<project name="LineageOS/android_device_samsung_msm8974-common" path="device/samsung/msm8974-common" remote="github" />
<project name="LineageOS/android_device_qcom_common" path="device/qcom/common" remote="github" />

View File

@ -1,5 +1,3 @@
ifeq ($(TARGET_PROVIDES_CAMERA_HAL),true)
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
@ -9,7 +7,7 @@ LOCAL_SRC_FILES := \
LOCAL_SHARED_LIBRARIES := \
libhardware liblog libcamera_client libutils
LOCAL_C_INCLUDES := \
LOCAL_C_INCLUDES += \
system/media/camera/include
LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
@ -17,5 +15,3 @@ LOCAL_MODULE := camera.$(TARGET_BOARD_PLATFORM)
LOCAL_MODULE_TAGS := optional
include $(BUILD_SHARED_LIBRARY)
endif

File diff suppressed because it is too large Load Diff

View File

@ -1,43 +1,249 @@
/*
* Copyright (C) 2017 The LineageOS Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#define CAMERA_PARAMETERS_EXTRA_C \
const char CameraParameters::KEY_DIS[] = "dis"; \
const char CameraParameters::DIS_DISABLE[] = "disable"; \
\
const char CameraParameters::KEY_ZSL[] = "zsl"; \
const char CameraParameters::ZSL_ON[] = "on"; \
const char CameraParameters::ZSL_OFF[] = "off"; \
\
int CameraParameters::getInt64(const char *key) const { return -1; } \
\
/* LAST_LINE OF CAMERA_PARAMETERS_EXTRA_C, every line before this one *MUST* have
* a backslash \ at the end of the line or else everything will break.
*/
#define CAMERA_PARAMETERS_EXTRA_H \
static const char KEY_DIS[]; \
static const char DIS_DISABLE[]; \
\
static const char KEY_ZSL[]; \
static const char ZSL_ON[]; \
static const char ZSL_OFF[]; \
\
int getInt64(const char *key) const; \
\
/* LAST_LINE OF CAMERA_PARAMETERS_EXTRA_H, every line before this one *MUST* have
* a backslash \ at the end of the line or else everything will break.
*/
/*
* Copyright (C) 2014 The CyanogenMod Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#define CAMERA_PARAMETERS_EXTRA_C \
const char CameraParameters::KEY_DIS[] = "dis"; \
const char CameraParameters::DIS_DISABLE[] = "disable"; \
const char CameraParameters::KEY_DYNAMIC_RANGE_CONTROL[] = "dynamic-range-control"; \
const char CameraParameters::KEY_SUPPORTED_DYNAMIC_RANGE_CONTROL[] = "dynamic-range-control-values"; \
const char CameraParameters::DRC_ON[] = "on"; \
const char CameraParameters::DRC_OFF[] = "off"; \
\
const char CameraParameters::KEY_PHASE_AF[] = "phase-af"; \
const char CameraParameters::KEY_SUPPORTED_PHASE_AF[] = "phase-af-values"; \
const char CameraParameters::PAF_ON[] = "on"; \
const char CameraParameters::PAF_OFF[] = "off"; \
\
const char CameraParameters::KEY_RT_HDR[] = "rt-hdr"; \
const char CameraParameters::KEY_SUPPORTED_RT_HDR[] = "rt-hdr-values"; \
const char CameraParameters::RTHDR_ON[] = "on"; \
const char CameraParameters::RTHDR_OFF[] = "off"; \
const char CameraParameters::KEY_SUPPORTED_ISO_MODES[] = "iso-values"; \
const char CameraParameters::KEY_FACE_DETECTION[] = "face-detection"; \
const char CameraParameters::KEY_SUPPORTED_FACE_DETECTION[] = "face-detection-values"; \
const char CameraParameters::FACE_DETECTION_OFF[] = "off"; \
const char CameraParameters::FACE_DETECTION_ON[] = "on"; \
const char CameraParameters::KEY_ZSL[] = "zsl"; \
const char CameraParameters::KEY_SUPPORTED_ZSL_MODES[] = "zsl-values"; \
const char CameraParameters::ZSL_OFF[] = "off"; \
const char CameraParameters::ZSL_ON[] = "on"; \
const char CameraParameters::KEY_ISO_MODE[] = "iso"; \
const char CameraParameters::KEY_CAMERA_MODE[] = "camera-mode"; \
const char CameraParameters::KEY_SAMSUNG_CAMERA_MODE[] = "cam_mode"; \
const char CameraParameters::KEY_SELECTABLE_ZONE_AF[] = "selectable-zone-af"; \
const char CameraParameters::KEY_SUPPORTED_SELECTABLE_ZONE_AF[] = "selectable-zone-af-values"; \
const char CameraParameters::SELECTABLE_ZONE_AF_AUTO[] = "auto"; \
const char CameraParameters::SELECTABLE_ZONE_AF_SPOT_METERING[] = "spot-metering"; \
const char CameraParameters::SELECTABLE_ZONE_AF_CENTER_WEIGHTED[] = "center-weighted"; \
const char CameraParameters::SELECTABLE_ZONE_AF_FRAME_AVERAGE[] = "frame-average"; \
const char CameraParameters::KEY_PREVIEW_FRAME_RATE_MODE[] = "preview-frame-rate-mode"; \
const char CameraParameters::KEY_SUPPORTED_PREVIEW_FRAME_RATE_MODES[] = "preview-frame-rate-modes"; \
const char CameraParameters::KEY_PREVIEW_FRAME_RATE_AUTO_MODE[] = "frame-rate-auto"; \
const char CameraParameters::KEY_PREVIEW_FRAME_RATE_FIXED_MODE[] = "frame-rate-fixed"; \
const char CameraParameters::KEY_SHARPNESS[] = "sharpness"; \
const char CameraParameters::KEY_SATURATION[] = "saturation"; \
const char CameraParameters::KEY_CONTRAST[] = "contrast"; \
const char CameraParameters::KEY_SCENE_DETECT[] = "scene-detect"; \
const char CameraParameters::KEY_SUPPORTED_SCENE_DETECT[] = "scene-detect-values"; \
const char CameraParameters::SCENE_DETECT_OFF[] = "off"; \
const char CameraParameters::SCENE_DETECT_ON[] = "on"; \
const char CameraParameters::KEY_WEATHER[] = "weather"; \
const char CameraParameters::KEY_CITYID[] = "contextualtag-cityid"; \
const char CameraParameters::KEY_TOUCH_AF_AEC[] = "touch-af-aec"; \
const char CameraParameters::KEY_SUPPORTED_TOUCH_AF_AEC[] = "touch-af-aec-values"; \
const char CameraParameters::TOUCH_AF_AEC_OFF[] = "touch-off"; \
const char CameraParameters::TOUCH_AF_AEC_ON[] = "touch-on"; \
const char CameraParameters::KEY_MEMORY_COLOR_ENHANCEMENT[] = "mce"; \
const char CameraParameters::KEY_LENSSHADE[] = "lensshade"; \
const char CameraParameters::KEY_REDEYE_REDUCTION[] = "redeye-reduction"; \
const char CameraParameters::KEY_SUPPORTED_REDEYE_REDUCTION[] = "redeye-reduction-values"; \
const char CameraParameters::REDEYE_REDUCTION_ENABLE[] = "enable"; \
const char CameraParameters::REDEYE_REDUCTION_DISABLE[] = "disable"; \
const char CameraParameters::KEY_GPS_LATITUDE_REF[] = "gps-latitude-ref"; \
const char CameraParameters::KEY_GPS_LONGITUDE_REF[] = "gps-longitude-ref"; \
const char CameraParameters::KEY_GPS_ALTITUDE_REF[] = "gps-altitude-ref"; \
const char CameraParameters::KEY_GPS_STATUS[] = "gps-status"; \
const char CameraParameters::KEY_EXIF_DATETIME[] = "exif-datetime"; \
const char CameraParameters::KEY_AUTO_EXPOSURE[] = "auto-exposure"; \
const char CameraParameters::KEY_SUPPORTED_AUTO_EXPOSURE[] = "auto-exposure-values"; \
const char CameraParameters::KEY_SUPPORTED_LENSSHADE_MODES[] = "lensshade-values"; \
const char CameraParameters::LENSSHADE_ENABLE[] = "enable"; \
const char CameraParameters::LENSSHADE_DISABLE[] = "disable"; \
const char CameraParameters::MCE_ENABLE[] = "enable"; \
const char CameraParameters::MCE_DISABLE[] = "disable"; \
const char CameraParameters::ISO_AUTO[] = "auto"; \
const char CameraParameters::ISO_HJR[] = "ISO_HJR"; \
const char CameraParameters::ISO_100[] = "ISO100"; \
const char CameraParameters::ISO_200[] = "ISO200"; \
const char CameraParameters::ISO_400[] = "ISO400"; \
const char CameraParameters::ISO_800[] = "ISO800"; \
const char CameraParameters::ISO_1600[] = "ISO1600"; \
const char CameraParameters::ISO_3200[] = "ISO3200"; \
const char CameraParameters::ISO_6400[] = "ISO6400"; \
const char CameraParameters::KEY_SUPPORTED_HFR_SIZES[] = "hfr-size-values"; \
const char CameraParameters::KEY_SUPPORTED_MEM_COLOR_ENHANCE_MODES[] = "mce-values"; \
const char CameraParameters::VIDEO_HFR_OFF[] = "off"; \
const char CameraParameters::VIDEO_HFR_2X[] = "60"; \
const char CameraParameters::VIDEO_HFR_3X[] = "90"; \
const char CameraParameters::VIDEO_HFR_4X[] = "120"; \
const char CameraParameters::KEY_VIDEO_HIGH_FRAME_RATE[] = "video-hfr"; \
const char CameraParameters::KEY_SUPPORTED_VIDEO_HIGH_FRAME_RATE_MODES[] = "video-hfr-values"; \
const char CameraParameters::KEY_HISTOGRAM[] = "histogram"; \
const char CameraParameters::KEY_SUPPORTED_HISTOGRAM_MODES[] = "histogram-values"; \
const char CameraParameters::HISTOGRAM_ENABLE[] = "enable"; \
const char CameraParameters::HISTOGRAM_DISABLE[] = "disable"; \
const char CameraParameters::SKIN_TONE_ENHANCEMENT_ENABLE[] = "enable"; \
const char CameraParameters::SKIN_TONE_ENHANCEMENT_DISABLE[] = "disable"; \
const char CameraParameters::KEY_SKIN_TONE_ENHANCEMENT[] = "skinToneEnhancement"; \
const char CameraParameters::KEY_SUPPORTED_SKIN_TONE_ENHANCEMENT_MODES[] = "skinToneEnhancement-values"; \
const char CameraParameters::DENOISE_OFF[] = "denoise-off"; \
const char CameraParameters::DENOISE_ON[] = "denoise-on"; \
const char CameraParameters::KEY_DENOISE[] = "denoise"; \
const char CameraParameters::KEY_SUPPORTED_DENOISE[] = "denoise-values"; \
const char CameraParameters::EFFECT_EMBOSS[] = "emboss"; \
const char CameraParameters::EFFECT_SKETCH[] = "sketch"; \
const char CameraParameters::EFFECT_NEON[] = "neon"; \
const char CameraParameters::SCENE_MODE_FLOWERS[] = "flowers"; \
const char CameraParameters::SCENE_MODE_AR[] = "AR"; \
const char CameraParameters::PIXEL_FORMAT_YUV420SP_ADRENO[] = "yuv420sp-adreno"; \
const char CameraParameters::PIXEL_FORMAT_RAW[] = "raw"; \
const char CameraParameters::PIXEL_FORMAT_YV12[] = "yuv420p"; \
const char CameraParameters::PIXEL_FORMAT_NV12[] = "nv12"; \
int CameraParameters::getInt64(const char *key) const { return -1; }; \
const char *CameraParameters::getPreviewFrameRateMode() const { return get(KEY_PREVIEW_FRAME_RATE_MODE); }; \
void CameraParameters::setPreviewFrameRateMode(const char *mode) { set(KEY_PREVIEW_FRAME_RATE_MODE, mode); }; \
void CameraParameters::getMeteringAreaCenter(int *x, int *y) const { }; \
void CameraParameters::setTouchIndexAec(int x, int y) { }; \
void CameraParameters::setTouchIndexAf(int x, int y) { }; \
void CameraParameters::setPreviewFpsRange(int minFPS, int maxFPS) { };
#define CAMERA_PARAMETERS_EXTRA_H \
static const char KEY_DIS[]; \
static const char DIS_DISABLE[]; \
\
static const char KEY_DYNAMIC_RANGE_CONTROL[]; \
static const char KEY_SUPPORTED_DYNAMIC_RANGE_CONTROL[]; \
static const char DRC_ON[]; \
static const char DRC_OFF[]; \
\
static const char KEY_PHASE_AF[]; \
static const char KEY_SUPPORTED_PHASE_AF[]; \
static const char PAF_ON[]; \
static const char PAF_OFF[]; \
\
static const char KEY_RT_HDR[]; \
static const char KEY_SUPPORTED_RT_HDR[]; \
static const char RTHDR_ON[]; \
static const char RTHDR_OFF[]; \
\
static const char KEY_SUPPORTED_ISO_MODES[]; \
static const char KEY_FACE_DETECTION[]; \
static const char KEY_SUPPORTED_FACE_DETECTION[]; \
static const char FACE_DETECTION_OFF[]; \
static const char FACE_DETECTION_ON[]; \
static const char KEY_ZSL[]; \
static const char KEY_SUPPORTED_ZSL_MODES[]; \
static const char ZSL_OFF[]; \
static const char ZSL_ON[]; \
static const char KEY_ISO_MODE[]; \
static const char KEY_CAMERA_MODE[]; \
static const char KEY_SAMSUNG_CAMERA_MODE[]; \
static const char KEY_SELECTABLE_ZONE_AF[]; \
static const char KEY_SUPPORTED_SELECTABLE_ZONE_AF[]; \
static const char SELECTABLE_ZONE_AF_AUTO[]; \
static const char SELECTABLE_ZONE_AF_SPOT_METERING[]; \
static const char SELECTABLE_ZONE_AF_CENTER_WEIGHTED[]; \
static const char SELECTABLE_ZONE_AF_FRAME_AVERAGE[]; \
static const char KEY_PREVIEW_FRAME_RATE_MODE[]; \
static const char KEY_SUPPORTED_PREVIEW_FRAME_RATE_MODES[]; \
static const char KEY_PREVIEW_FRAME_RATE_AUTO_MODE[]; \
static const char KEY_PREVIEW_FRAME_RATE_FIXED_MODE[]; \
static const char KEY_SHARPNESS[]; \
static const char KEY_SATURATION[]; \
static const char KEY_CONTRAST[]; \
static const char KEY_SCENE_DETECT[]; \
static const char KEY_SUPPORTED_SCENE_DETECT[]; \
static const char SCENE_DETECT_OFF[]; \
static const char SCENE_DETECT_ON[]; \
static const char KEY_WEATHER[]; \
static const char KEY_CITYID[]; \
static const char KEY_TOUCH_AF_AEC[]; \
static const char KEY_SUPPORTED_TOUCH_AF_AEC[]; \
static const char TOUCH_AF_AEC_OFF[]; \
static const char TOUCH_AF_AEC_ON[]; \
static const char KEY_MEMORY_COLOR_ENHANCEMENT[]; \
static const char KEY_LENSSHADE[]; \
static const char KEY_REDEYE_REDUCTION[]; \
static const char KEY_SUPPORTED_REDEYE_REDUCTION[]; \
static const char REDEYE_REDUCTION_ENABLE[]; \
static const char REDEYE_REDUCTION_DISABLE[]; \
static const char KEY_GPS_LATITUDE_REF[]; \
static const char KEY_GPS_LONGITUDE_REF[]; \
static const char KEY_GPS_ALTITUDE_REF[]; \
static const char KEY_GPS_STATUS[]; \
static const char KEY_EXIF_DATETIME[]; \
static const char KEY_AUTO_EXPOSURE[]; \
static const char KEY_SUPPORTED_AUTO_EXPOSURE[]; \
static const char KEY_SUPPORTED_LENSSHADE_MODES[]; \
static const char LENSSHADE_ENABLE[]; \
static const char LENSSHADE_DISABLE[]; \
static const char MCE_ENABLE[]; \
static const char MCE_DISABLE[]; \
static const char ISO_AUTO[]; \
static const char ISO_HJR[]; \
static const char ISO_100[]; \
static const char ISO_200[]; \
static const char ISO_400[]; \
static const char ISO_800[]; \
static const char ISO_1600[]; \
static const char ISO_3200[]; \
static const char ISO_6400[]; \
static const char KEY_SUPPORTED_HFR_SIZES[]; \
static const char KEY_SUPPORTED_MEM_COLOR_ENHANCE_MODES[]; \
static const char VIDEO_HFR_OFF[]; \
static const char VIDEO_HFR_2X[]; \
static const char VIDEO_HFR_3X[]; \
static const char VIDEO_HFR_4X[]; \
static const char KEY_VIDEO_HIGH_FRAME_RATE[]; \
static const char KEY_SUPPORTED_VIDEO_HIGH_FRAME_RATE_MODES[]; \
static const char KEY_HISTOGRAM[]; \
static const char KEY_SUPPORTED_HISTOGRAM_MODES[]; \
static const char HISTOGRAM_ENABLE[]; \
static const char HISTOGRAM_DISABLE[]; \
static const char SKIN_TONE_ENHANCEMENT_ENABLE[]; \
static const char SKIN_TONE_ENHANCEMENT_DISABLE[]; \
static const char KEY_SKIN_TONE_ENHANCEMENT[]; \
static const char KEY_SUPPORTED_SKIN_TONE_ENHANCEMENT_MODES[]; \
static const char DENOISE_OFF[]; \
static const char DENOISE_ON[]; \
static const char KEY_DENOISE[]; \
static const char KEY_SUPPORTED_DENOISE[];\
static const char EFFECT_EMBOSS[]; \
static const char EFFECT_SKETCH[]; \
static const char EFFECT_NEON[]; \
static const char SCENE_MODE_FLOWERS[]; \
static const char SCENE_MODE_AR[]; \
static const char PIXEL_FORMAT_YUV420SP_ADRENO[]; \
static const char PIXEL_FORMAT_RAW[]; \
static const char PIXEL_FORMAT_YV12[]; \
static const char PIXEL_FORMAT_NV12[]; \
int getInt64(const char *key) const; \
const char *getPreviewFrameRateMode() const; \
void setPreviewFrameRateMode(const char *mode); \
void getMeteringAreaCenter(int *x, int *y) const; \
void setTouchIndexAec(int x, int y); \
void setTouchIndexAf(int x, int y); \
void setPreviewFpsRange(int minFPS, int maxFPS);