sanders: Tree cleanup

*Move telephony-ext from BoardConfig.mk to device.mk.
*Remove tagGoogle
*Delete init.qcom/ril.sh
 -Unnecessary.
*Remove contexts from fstab.recovery
 -Needed after enforcing.
*Remove Android.bp libhidl.
*Update system.prop.
This commit is contained in:
Keertesh
2018-06-13 13:40:23 +05:30
committed by Keertesh19
parent 5cd6fae534
commit df0130358e
7 changed files with 30 additions and 58 deletions

View File

@@ -1,3 +0,0 @@
subdirs = [
"libhidl",
]

View File

@@ -39,19 +39,12 @@ TARGET_ARCH_VARIANT := armv8-a
TARGET_CPU_ABI := arm64-v8a TARGET_CPU_ABI := arm64-v8a
TARGET_CPU_ABI2 := TARGET_CPU_ABI2 :=
TARGET_CPU_VARIANT := cortex-a53 TARGET_CPU_VARIANT := cortex-a53
TARGET_2ND_ARCH := arm TARGET_2ND_ARCH := arm
TARGET_2ND_ARCH_VARIANT := armv7-a-neon TARGET_2ND_ARCH_VARIANT := armv7-a-neon
TARGET_2ND_CPU_ABI := armeabi-v7a TARGET_2ND_CPU_ABI := armeabi-v7a
TARGET_2ND_CPU_ABI2 := armeabi TARGET_2ND_CPU_ABI2 := armeabi
TARGET_2ND_CPU_VARIANT := cortex-a53 TARGET_2ND_CPU_VARIANT := cortex-a53
TARGET_CPU_CORTEX_A53 := true TARGET_CPU_CORTEX_A53 := true
# TARGET_PREFER_32_BIT := true
# TARGET_SUPPORTS_32_BIT_APPS := true
# TARGET_SUPPORTS_64_BIT_APPS := true
# TARGET_BOARD_SUFFIX := _64
TARGET_USES_64_BIT_BINDER := true TARGET_USES_64_BIT_BINDER := true
# Asserts # Asserts
@@ -81,9 +74,11 @@ TARGET_KERNEL_HEADER_ARCH := arm64
TARGET_KERNEL_CONFIG := sanders_defconfig TARGET_KERNEL_CONFIG := sanders_defconfig
TARGET_KERNEL_SOURCE := kernel/motorola/msm8953 TARGET_KERNEL_SOURCE := kernel/motorola/msm8953
# ToolChain
KERNEL_TOOLCHAIN := $(ANDROID_BUILD_TOP)/prebuilts/gcc/$(HOST_OS)-x86/aarch64/aarch64-linux-android-4.9/bin KERNEL_TOOLCHAIN := $(ANDROID_BUILD_TOP)/prebuilts/gcc/$(HOST_OS)-x86/aarch64/aarch64-linux-android-4.9/bin
TARGET_KERNEL_CROSS_COMPILE_PREFIX := aarch64-linux-androidkernel- TARGET_KERNEL_CROSS_COMPILE_PREFIX := aarch64-linux-androidkernel-
# SDCLANG
TARGET_USE_SDCLANG := true TARGET_USE_SDCLANG := true
# Audio # Audio
@@ -123,7 +118,6 @@ BOARD_HAVE_BLUETOOTH := true
BOARD_HAVE_BLUETOOTH_QCOM := true BOARD_HAVE_BLUETOOTH_QCOM := true
# Camera # Camera
# TARGET_CAMERASERVICE_CLOSES_NATIVE_HANDLES := true
USE_DEVICE_SPECIFIC_CAMERA := true USE_DEVICE_SPECIFIC_CAMERA := true
BOARD_QTI_CAMERA_32BIT_ONLY := true BOARD_QTI_CAMERA_32BIT_ONLY := true
@@ -139,7 +133,14 @@ TARGET_TAP_TO_WAKE_NODE := "/sys/android_touch/doubletap2wake"
TARGET_HW_DISK_ENCRYPTION := true TARGET_HW_DISK_ENCRYPTION := true
# Enable dexpreopt to speed boot time # Enable dexpreopt to speed boot time
WITH_DEXPREOPT := true ifeq ($(HOST_OS),linux)
ifneq ($(TARGET_BUILD_VARIANT),eng)
ifeq ($(WITH_DEXPREOPT),)
WITH_DEXPREOPT := true
WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY := true
endif
endif
endif
# Display # Display
BOARD_USES_ADRENO := true BOARD_USES_ADRENO := true
@@ -176,11 +177,7 @@ TARGET_PROVIDES_LIBLIGHT := true
DEVICE_MANIFEST_FILE := $(DEVICE_PATH)/configs/manifest.xml DEVICE_MANIFEST_FILE := $(DEVICE_PATH)/configs/manifest.xml
DEVICE_MATRIX_FILE := $(DEVICE_PATH)/configs/compatibility_matrix.xml DEVICE_MATRIX_FILE := $(DEVICE_PATH)/configs/compatibility_matrix.xml
# Media # NFC
# TARGET_USES_MEDIA_EXTENSIONS := true
PRODUCT_BOOT_JARS += telephony-ext
NXP_CHIP_TYPE := PN551 NXP_CHIP_TYPE := PN551
BOARD_NFC_HAL_SUFFIX := $(TARGET_BOARD_PLATFORM) BOARD_NFC_HAL_SUFFIX := $(TARGET_BOARD_PLATFORM)
@@ -205,6 +202,7 @@ BOARD_HAS_NO_SELECT_BUTTON := true
TARGET_RECOVERY_FSTAB := $(DEVICE_PATH)/rootdir/etc/fstab.recovery TARGET_RECOVERY_FSTAB := $(DEVICE_PATH)/rootdir/etc/fstab.recovery
TARGET_USERIMAGES_USE_EXT4 := true TARGET_USERIMAGES_USE_EXT4 := true
TARGET_USERIMAGES_USE_F2FS := true TARGET_USERIMAGES_USE_F2FS := true
LZMA_RAMDISK_TARGETS := recovery
# Releasetools # Releasetools
TARGET_RELEASETOOLS_EXTENSIONS := $(DEVICE_PATH)/releasetools TARGET_RELEASETOOLS_EXTENSIONS := $(DEVICE_PATH)/releasetools
@@ -237,3 +235,5 @@ WIFI_DRIVER_FW_PATH_STA := "sta"
WIFI_DRIVER_FW_PATH_P2P := "p2p" WIFI_DRIVER_FW_PATH_P2P := "p2p"
WPA_SUPPLICANT_VERSION := VER_0_8_X WPA_SUPPLICANT_VERSION := VER_0_8_X
# MISSING_DEPENDENCIES
ALLOW_MISSING_DEPENDENCIES=true

View File

@@ -95,7 +95,7 @@ PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/audio/audio_ext_spkr.conf:system/vendor/etc/audio_ext_spkr.conf \ $(LOCAL_PATH)/audio/audio_ext_spkr.conf:system/vendor/etc/audio_ext_spkr.conf \
$(LOCAL_PATH)/audio/audio_platform_info.xml:system/vendor/etc/audio_platform_info.xml \ $(LOCAL_PATH)/audio/audio_platform_info.xml:system/vendor/etc/audio_platform_info.xml \
$(LOCAL_PATH)/audio/sound_trigger_mixer_paths.xml:system/vendor/etc/sound_trigger_mixer_paths.xml \ $(LOCAL_PATH)/audio/sound_trigger_mixer_paths.xml:system/vendor/etc/sound_trigger_mixer_paths.xml \
$(LOCAL_PATH)/audio/sound_trigger_platform_info.xml:system/vendor/etc/sound_trigger_platform_info.xml $(LOCAL_PATH)/audio/sound_trigger_platform_info.xml:system/vendor/etc/sound_trigger_platform_info.xml
# Bluetooth # Bluetooth
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
@@ -279,7 +279,6 @@ PRODUCT_PACKAGES += \
nfc_nci.msm8953 \ nfc_nci.msm8953 \
NfcNci \ NfcNci \
Tag \ Tag \
TagGoogle \
com.android.nfc_extras \ com.android.nfc_extras \
android.hardware.nfc@1.0-impl android.hardware.nfc@1.0-impl
@@ -314,7 +313,7 @@ PRODUCT_PACKAGES += \
init.mmi.boot.sh \ init.mmi.boot.sh \
init.mmi.rc \ init.mmi.rc \
init.mmi.usb.rc \ init.mmi.usb.rc \
init.qcom.rc \ init.qcom.rc
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/rootdir/etc/ueventd.qcom.rc:system/vendor/ueventd.rc $(LOCAL_PATH)/rootdir/etc/ueventd.qcom.rc:system/vendor/ueventd.rc
@@ -348,6 +347,9 @@ PRODUCT_PACKAGES += \
ims-ext-common \ ims-ext-common \
telephony-ext telephony-ext
PRODUCT_BOOT_JARS += \
telephony-ext
# Sensors # Sensors
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/configs/sensors/hals.conf:system/etc/sensors/hals.conf \ $(LOCAL_PATH)/configs/sensors/hals.conf:system/etc/sensors/hals.conf \

View File

@@ -1,21 +0,0 @@
cc_library_shared {
name: "android.hidl.base@1.0",
vendor_available: true,
shared_libs: [
"libhidltransport",
],
export_shared_lib_headers: [
"libhidltransport",
],
}
cc_library_shared {
name: "android.hidl.manager@1.0",
vendor_available: true,
shared_libs: [
"libhidltransport",
],
export_shared_lib_headers: [
"libhidltransport",
],
}

View File

@@ -9,10 +9,10 @@
/dev/block/bootdevice/by-name/system /system ext4 ro,barrier=1,discard wait /dev/block/bootdevice/by-name/system /system ext4 ro,barrier=1,discard wait
/dev/block/bootdevice/by-name/userdata /data f2fs rw,discard,nosuid,nodev,noatime,nodiratime,nobarrier,inline_xattr,inline_data wait,check,formattable,encryptable=/dev/block/bootdevice/by-name/metadata /dev/block/bootdevice/by-name/userdata /data f2fs rw,discard,nosuid,nodev,noatime,nodiratime,nobarrier,inline_xattr,inline_data wait,check,formattable,encryptable=/dev/block/bootdevice/by-name/metadata
/dev/block/bootdevice/by-name/cache /cache ext4 rw,noatime,nosuid,nodev,barrier=1,data=ordered wait,check,formattable /dev/block/bootdevice/by-name/cache /cache ext4 rw,noatime,nosuid,nodev,barrier=1,data=ordered wait,check,formattable
/dev/block/bootdevice/by-name/modem /firmware ext4 ro,nosuid,nodev,barrier=0,context=u:object_r:firmware_file:s0 wait /dev/block/bootdevice/by-name/modem /firmware ext4 ro,nosuid,nodev,barrier=0 wait
/dev/block/bootdevice/by-name/fsg /fsg ext4 ro,nosuid,nodev,context=u:object_r:fsg_file:s0 wait /dev/block/bootdevice/by-name/fsg /fsg ext4 ro,nosuid,nodev wait
/dev/block/bootdevice/by-name/dsp /dsp ext4 ro,nosuid,nodev,barrier=1 wait /dev/block/bootdevice/by-name/dsp /dsp ext4 ro,nosuid,nodev,barrier=1 wait
/dev/block/bootdevice/by-name/persist /persist ext4 nosuid,nodev,barrier=1,noatime,noauto_da_alloc,context=u:object_r:persist_file:s0 wait /dev/block/bootdevice/by-name/persist /persist ext4 nosuid,nodev,barrier=1,noatime,noauto_da_alloc wait
/dev/block/bootdevice/by-name/boot /boot emmc defaults recoveryonly /dev/block/bootdevice/by-name/boot /boot emmc defaults recoveryonly
/dev/block/bootdevice/by-name/recovery /recovery emmc defaults recoveryonly /dev/block/bootdevice/by-name/recovery /recovery emmc defaults recoveryonly
/dev/block/bootdevice/by-name/misc /misc emmc defaults defaults /dev/block/bootdevice/by-name/misc /misc emmc defaults defaults

View File

@@ -1,8 +0,0 @@
#!/system/bin/sh
export PATH=/system/xbin:$PATH
multisim=`getprop persist.radio.multisim.config`
if [ "$multisim" = "dsds" ] || [ "$multisim" = "dsda" ]; then
start ril-daemon2
fi

View File

@@ -21,7 +21,6 @@ av.offload.enable=false
av.debug.disable.pers.cache=1 av.debug.disable.pers.cache=1
persist.audio.endcall.delay=250 persist.audio.endcall.delay=250
qcom.hw.aac.encoder=false qcom.hw.aac.encoder=false
persist.audio.calfile0=/etc/acdbdata/Bluetooth_cal.acdb persist.audio.calfile0=/etc/acdbdata/Bluetooth_cal.acdb
persist.audio.calfile1=/etc/acdbdata/General_cal.acdb persist.audio.calfile1=/etc/acdbdata/General_cal.acdb
persist.audio.calfile2=/etc/acdbdata/Global_cal.acdb persist.audio.calfile2=/etc/acdbdata/Global_cal.acdb
@@ -29,14 +28,12 @@ persist.audio.calfile3=/etc/acdbdata/Handset_cal.acdb
persist.audio.calfile4=/etc/acdbdata/Hdmi_cal.acdb persist.audio.calfile4=/etc/acdbdata/Hdmi_cal.acdb
persist.audio.calfile5=/etc/acdbdata/Headset_cal.acdb persist.audio.calfile5=/etc/acdbdata/Headset_cal.acdb
persist.audio.calfile6=/etc/acdbdata/Speaker_cal.acdb persist.audio.calfile6=/etc/acdbdata/Speaker_cal.acdb
persist.vendor.audio.fluence.speaker=false persist.vendor.audio.fluence.speaker=false
persist.vendor.audio.fluence.voicecall=true persist.vendor.audio.fluence.voicecall=true
persist.vendor.audio.fluence.voicecomm=true persist.vendor.audio.fluence.voicecomm=true
persist.vendor.audio.fluence.voicerec=false persist.vendor.audio.fluence.voicerec=false
ro.qc.sdk.audio.fluencetype=none ro.qc.sdk.audio.fluencetype=none
ro.qc.sdk.audio.ssr=false ro.qc.sdk.audio.ssr=false
vendor.use.voice.path.for.pcm.voip=false vendor.use.voice.path.for.pcm.voip=false
# Bluetooth # Bluetooth
@@ -73,6 +70,8 @@ vendor.vidc.disable.split.mode=1
vendor.vidc.enc.disable.pq=true vendor.vidc.enc.disable.pq=true
vendor.vidc.dec.downscalar_width=1920 vendor.vidc.dec.downscalar_width=1920
vendor.vidc.dec.downscalar_height=1088 vendor.vidc.dec.downscalar_height=1088
media.camera.ts.monotonic=1
persist.camera.time.monotonic=1
# CNE # CNE
persist.cne.feature=1 persist.cne.feature=1
@@ -102,7 +101,7 @@ persist.hwc.mdpcomp.enable=true
dev.pm.dyn_samplingrate=1 dev.pm.dyn_samplingrate=1
persist.demo.hdmirotationlock=false persist.demo.hdmirotationlock=false
ro.opengles.version=196610 ro.opengles.version=196610
ro.sf.lcd_density=480 ro.sf.lcd_density=420
persist.debug.wfd.enable=1 persist.debug.wfd.enable=1
sdm.debug.disable_skip_validate=1 sdm.debug.disable_skip_validate=1
debug.gralloc.enable_fb_ubwc=1 debug.gralloc.enable_fb_ubwc=1
@@ -112,7 +111,7 @@ persist.camera.video.ubwc=0
# FM # FM
ro.fm.transmitter=false ro.fm.transmitter=false
#HWUI properties # HWUI properties
ro.hwui.texture_cache_size=72 ro.hwui.texture_cache_size=72
ro.hwui.layer_cache_size=48 ro.hwui.layer_cache_size=48
ro.hwui.r_buffer_cache_size=8 ro.hwui.r_buffer_cache_size=8
@@ -141,6 +140,8 @@ persist.ims.vt=false
persist.ims.vt.epdg=false persist.ims.vt.epdg=false
persist.mm.sta.enable=0 persist.mm.sta.enable=0
persist.vt.supported=0 persist.vt.supported=0
persist.volte_enabled_by_hw=1
persist.dbg.volte_avail_ovr=1
# Media # Media
media.aac_51_output_enabled=true media.aac_51_output_enabled=true
@@ -204,6 +205,7 @@ ro.telephony.call_ring.multiple=false
persist.vendor.radio.eri64_as_home=1 persist.vendor.radio.eri64_as_home=1
persist.vendor.radio.data_con_rprt=1 persist.vendor.radio.data_con_rprt=1
# Netmgrd
ro.use_data_netmgrd=true ro.use_data_netmgrd=true
persist.data.qmi.adb_logmask=0 persist.data.qmi.adb_logmask=0
persist.data.netmgrd.qos.enable=true persist.data.netmgrd.qos.enable=true
@@ -227,7 +229,7 @@ ro.hardware.sensors=sanders
# SensorService # SensorService
system_init.startsensorservice=0 system_init.startsensorservice=0
#Trim properties # Trim properties
ro.vendor.qti.sys.fw.trim_enable_memory=2147483648 ro.vendor.qti.sys.fw.trim_enable_memory=2147483648
# USB # USB