diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index 5eddba3..a75351d 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -32,6 +32,8 @@ BOARD_HARDWARE_CLASS += $(VENDOR_PATH)/cmhw # Filesystem TARGET_FS_CONFIG_GEN := device/samsung/msm8226-common/config.fs +BOARD_USES_QCOM_HARDWARE := true + #ADB TARGET_USES_LEGACY_ADB_INTERFACE :=true @@ -50,7 +52,6 @@ TARGET_QCOM_NO_FM_FIRMWARE := true BOARD_HAVE_QCOM_FM := true # Properites -BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true TARGET_VENDOR_PROP += $(DEVICE_PATH)/vendor.prop # SELinux include device/qcom/sepolicy/sepolicy.mk diff --git a/board/treble.mk b/board/treble.mk index 0c5c71a..f2423e2 100644 --- a/board/treble.mk +++ b/board/treble.mk @@ -2,7 +2,7 @@ PRODUCT_SHIPPING_API_LEVEL := 19 PRODUCT_FULL_TREBLE_OVERRIDE := true PRODUCT_COMPATIBILITY_MATRIX_LEVEL_OVERRIDE := 27 +BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true -# VNDK -BOARD_VNDK_VERSION := current BOARD_VNDK_RUNTIME_DISABLE := true +BOARD_VNDK_VERSION := current diff --git a/compatibility_matrix.xml b/compatibility_matrix.xml index b56684b..1562b24 100644 --- a/compatibility_matrix.xml +++ b/compatibility_matrix.xml @@ -90,7 +90,4 @@ netutils-wrapper 1.0 - - 0.0.0 - diff --git a/manifest.xml b/manifest.xml index 5216ebe..f45f690 100644 --- a/manifest.xml +++ b/manifest.xml @@ -98,6 +98,37 @@ default + + android.hardware.graphics.composer + hwbinder + 2.1 + + IComposer + default + + + + android.hardware.media.omx + passthrough + 1.0 + + IOmx + default + + + IOmxStore + default + + + + android.hardware.gatekeeper + passthrough + 1.0 + + IGatekeeper + default + + android.hardware.graphics.mapper passthrough @@ -185,86 +216,6 @@ - - android.frameworks.displayservice - 1.0 - - IDisplayService - default - - - - android.frameworks.schedulerservice - 1.0 - - ISchedulingPolicyService - default - - - - android.frameworks.sensorservice - 1.0 - - ISensorManager - default - - - - android.hardware.graphics.composer - 2.1 - - IComposer - vr - - - - android.hidl.allocator - 1.0 - - IAllocator - ashmem - - - - android.hidl.manager - 1.1 - - IServiceManager - default - - - - android.hidl.memory - 1.0 - - IMapper - ashmem - - - - android.hidl.token - 1.0 - - ITokenManager - default - - - - android.system.net.netd - 1.0 - - INetd - default - - - - android.system.wifi.keystore - 1.0 - - IKeystore - default - - android.hardware.vibrator passthrough 1.0 diff --git a/msm8226.mk b/msm8226.mk index 524adb9..6c58398 100644 --- a/msm8226.mk +++ b/msm8226.mk @@ -73,7 +73,6 @@ PRODUCT_PACKAGES += \ android.hardware.camera.provider@2.4-impl-legacy \ camera.device@1.0-impl-legacy \ libboringssl-compat \ - camera.msm8226 \ libxml2 \ Snap @@ -92,6 +91,8 @@ PRODUCT_PACKAGES += \ memtrack.msm8226 \ android.hardware.graphics.allocator@2.0-impl \ android.hardware.graphics.allocator@2.0-service \ + android.hardware.graphics.composer@2.1-impl \ + android.hardware.graphics.composer@2.1-service \ android.hardware.graphics.mapper@2.0-impl \ android.hardware.memtrack@1.0-impl \ android.hardware.memtrack@1.0-service @@ -107,17 +108,21 @@ PRODUCT_PACKAGES += \ FMRadio \ libfmjni +# VNDK +PRODUCT_PACKAGES += \ + s3ve3g-vndk-extra + PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/gps/flp.conf:system/etc/flp.conf \ - $(LOCAL_PATH)/gps/gps.conf:system/etc/gps.conf \ - $(LOCAL_PATH)/gps/sap.conf:system/etc/sap.conf + $(LOCAL_PATH)/gps/flp.conf:$(TARGET_COPY_OUT_VENDOR)/etc/flp.conf \ + $(LOCAL_PATH)/gps/gps.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gps.conf \ + $(LOCAL_PATH)/gps/sap.conf:$(TARGET_COPY_OUT_VENDOR)/etc/sap.conf # Keylayouts PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/keylayout/Button_Jack.kl:system/usr/keylayout/Button_Jack.kl \ - $(LOCAL_PATH)/keylayout/gpio-keys.kl:system/usr/keylayout/gpio-keys.kl \ - $(LOCAL_PATH)/keylayout/sec_touchkey.kl:system/usr/keylayout/sec_touchkey.kl \ - $(LOCAL_PATH)/keylayout/synaptics_rmi4_i2c.kl:system/usr/keylayout/synaptics_rmi4_i2c.kl + $(LOCAL_PATH)/keylayout/Button_Jack.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/Button_Jack.kl \ + $(LOCAL_PATH)/keylayout/gpio-keys.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/gpio-keys.kl \ + $(LOCAL_PATH)/keylayout/sec_touchkey.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/sec_touchkey.kl \ + $(LOCAL_PATH)/keylayout/synaptics_rmi4_i2c.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/synaptics_rmi4_i2c.kl # Keystore PRODUCT_PACKAGES += \ @@ -125,11 +130,11 @@ PRODUCT_PACKAGES += \ # Media PRODUCT_COPY_FILES += \ - frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:system/etc/media_codecs_google_audio.xml \ - frameworks/av/media/libstagefright/data/media_codecs_google_telephony.xml:system/etc/media_codecs_google_telephony.xml \ - frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:system/etc/media_codecs_google_video.xml \ - $(LOCAL_PATH)/configs/media_codecs_performance.xml:system/etc/media_codecs_performance.xml \ - $(LOCAL_PATH)/configs/media_codecs.xml:system/etc/media_codecs.xml + frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_audio.xml \ + frameworks/av/media/libstagefright/data/media_codecs_google_telephony.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_telephony.xml \ + frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_video.xml \ + $(LOCAL_PATH)/configs/media_codecs_performance.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance.xml \ + $(LOCAL_PATH)/configs/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml # OMX PRODUCT_PACKAGES += \ @@ -145,28 +150,28 @@ PRODUCT_PACKAGES += \ # Permissions PRODUCT_COPY_FILES += \ - frameworks/native/data/etc/android.hardware.audio.low_latency.xml:system/etc/permissions/android.hardware.audio.low_latency.xml \ - frameworks/native/data/etc/android.hardware.bluetooth.xml:system/etc/permissions/android.hardware.bluetooth.xml \ - frameworks/native/data/etc/android.hardware.bluetooth_le.xml:system/etc/permissions/android.hardware.bluetooth_le.xml \ - frameworks/native/data/etc/android.hardware.camera.autofocus.xml:system/etc/permissions/android.hardware.camera.autofocus.xml \ - frameworks/native/data/etc/android.hardware.camera.flash-autofocus.xml:system/etc/permissions/android.hardware.camera.flash-autofocus.xml \ - frameworks/native/data/etc/android.hardware.camera.front.xml:system/etc/permissions/android.hardware.camera.front.xml \ - frameworks/native/data/etc/android.hardware.camera.xml:system/etc/permissions/android.hardware.camera.xml \ - frameworks/native/data/etc/android.hardware.location.gps.xml:system/etc/permissions/android.hardware.location.gps.xml \ - frameworks/native/data/etc/android.hardware.sensor.accelerometer.xml:system/etc/permissions/android.hardware.sensor.accelerometer.xml \ - frameworks/native/data/etc/android.hardware.sensor.compass.xml:system/etc/permissions/android.hardware.sensor.compass.xml \ - frameworks/native/data/etc/android.hardware.sensor.light.xml:system/etc/permissions/android.hardware.sensor.light.xml \ - frameworks/native/data/etc/android.hardware.sensor.proximity.xml:system/etc/permissions/android.hardware.sensor.proximity.xml \ - frameworks/native/data/etc/android.hardware.telephony.cdma.xml:system/etc/permissions/android.hardware.telephony.cdma.xml \ - frameworks/native/data/etc/android.hardware.telephony.gsm.xml:system/etc/permissions/android.hardware.telephony.gsm.xml \ - frameworks/native/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:system/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml \ - frameworks/native/data/etc/android.hardware.usb.accessory.xml:system/etc/permissions/android.hardware.usb.accessory.xml \ - frameworks/native/data/etc/android.hardware.usb.host.xml:system/etc/permissions/android.hardware.usb.host.xml \ - frameworks/native/data/etc/android.hardware.wifi.direct.xml:system/etc/permissions/android.hardware.wifi.direct.xml \ - frameworks/native/data/etc/android.hardware.wifi.xml:system/etc/permissions/android.hardware.wifi.xml \ - frameworks/native/data/etc/android.software.sip.voip.xml:system/etc/permissions/android.software.sip.voip.xml \ - frameworks/native/data/etc/handheld_core_hardware.xml:system/etc/permissions/handheld_core_hardware.xml \ - frameworks/native/data/etc/android.software.midi.xml:system/etc/permissions/android.software.midi.xml + frameworks/native/data/etc/android.hardware.audio.low_latency.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.audio.low_latency.xml \ + frameworks/native/data/etc/android.hardware.bluetooth.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.bluetooth.xml \ + frameworks/native/data/etc/android.hardware.bluetooth_le.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.bluetooth_le.xml \ + frameworks/native/data/etc/android.hardware.camera.autofocus.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.autofocus.xml \ + frameworks/native/data/etc/android.hardware.camera.flash-autofocus.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.flash-autofocus.xml \ + frameworks/native/data/etc/android.hardware.camera.front.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.front.xml \ + frameworks/native/data/etc/android.hardware.camera.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.xml \ + frameworks/native/data/etc/android.hardware.location.gps.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.location.gps.xml \ + frameworks/native/data/etc/android.hardware.sensor.accelerometer.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.accelerometer.xml \ + frameworks/native/data/etc/android.hardware.sensor.compass.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.compass.xml \ + frameworks/native/data/etc/android.hardware.sensor.light.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.light.xml \ + frameworks/native/data/etc/android.hardware.sensor.proximity.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.proximity.xml \ + frameworks/native/data/etc/android.hardware.telephony.cdma.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.telephony.cdma.xml \ + frameworks/native/data/etc/android.hardware.telephony.gsm.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.telephony.gsm.xml \ + frameworks/native/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml \ + frameworks/native/data/etc/android.hardware.usb.accessory.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.usb.accessory.xml \ + frameworks/native/data/etc/android.hardware.usb.host.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.usb.host.xml \ + frameworks/native/data/etc/android.hardware.wifi.direct.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.direct.xml \ + frameworks/native/data/etc/android.hardware.wifi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.xml \ + frameworks/native/data/etc/android.software.sip.voip.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.sip.voip.xml \ + frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml \ + frameworks/native/data/etc/android.software.midi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.midi.xml # GPS HAL PRODUCT_PACKAGES += \ @@ -232,6 +237,11 @@ PRODUCT_PACKAGES += \ android.hardware.light@2.0-service \ lights.MSM8226 +# Gatekeeper +PRODUCT_PACKAGES += \ + android.hardware.gatekeeper@1.0-impl \ + android.hardware.gatekeeper@1.0-service + # Wifi PRODUCT_PACKAGES += \ dhcpcd.conf \ diff --git a/rootdir/init.qcom.rc b/rootdir/init.qcom.rc index 3c6e2c4..774ee54 100644 --- a/rootdir/init.qcom.rc +++ b/rootdir/init.qcom.rc @@ -54,6 +54,7 @@ on fs symlink /dev/block/platform/soc.0/${ro.boot.bootdevice} /dev/block/bootdevice mount_all fstab.qcom + start fwlink # Support Preload install apks # mkdir /preload 0771 system system diff --git a/vendor.prop b/vendor.prop index 58eb904..0e2e505 100644 --- a/vendor.prop +++ b/vendor.prop @@ -1,6 +1,3 @@ -# Art -dalvik.vm.dex2oat-swap=false - # Audio af.fast_track_multiplier=1 audio_hal.period_size=192 @@ -39,6 +36,7 @@ media.stagefright.less-secure=true persist.media.treble_omx=false # Dalvik +dalvik.vm.dex2oat-swap=false dalvik.vm.heapstartsize=8m dalvik.vm.heapgrowthlimit=128m dalvik.vm.heapsize=512m @@ -53,9 +51,6 @@ ro.qualcomm.cabl=0 ro.sf.lcd_density=320 debug.hwui.use_buffer_age=false -# Android GO -ro.config.low_ram=true - # GPS persist.gps.qc_nlp_in_use=1 ro.gps.agps_provider=1 @@ -95,7 +90,7 @@ debug.sensors=1 persist.timed.enable=true # Vendor security patch level -ro.lineage.build.vendor_security_patch=2017-08-01 +ro.lineage.build.vendor_security_patch=2019-02-27 # Wi-Fi ro.disableWifiApFirmwareReload=true diff --git a/vndk/Android.mk b/vndk/Android.mk index 6608c16..7f8b819 100644 --- a/vndk/Android.mk +++ b/vndk/Android.mk @@ -1,41 +1,22 @@ -VNDK_SP_LIBRARIES := \ - android.hardware.graphics.allocator@2.0 \ - android.hardware.graphics.common@1.0 \ - android.hardware.graphics.mapper@2.0 \ - android.hardware.renderscript@1.0 \ - android.hidl.memory@1.0 \ - libRSCpuRef \ - libRSDriver \ - libRS_internal \ - libbacktrace \ - libbase \ - libbcinfo \ - libblas \ - libc++ \ - libcompiler_rt \ - libcutils \ - libft2 \ - libhardware \ - libhidlbase \ - libhidlmemory \ - libhidltransport \ - libhwbinder \ - libion \ - liblzma \ - libpng \ - libunwind \ - libutils \ - libz +VNDK_SP_LIBRARIES := EXTRA_VENDOR_LIBRARIES := \ android.hidl.base@1.0 \ android.hidl.manager@1.0 \ + libhardware_legacy \ libbinder \ libui \ - libhardware_legacy \ android.hardware.configstore@1.0 \ android.hardware.configstore-utils \ - android.hardware.nfc@1.0 + libstagefright_foundation \ + libstdc++ \ + libnativehelper \ + libgui \ + android.hidl.token@1.0-utils \ + android.hardware.graphics.bufferqueue@1.0 \ + android.hidl.token@1.0 \ + android.hardware.media.omx@1.0 \ + android.hardware.media@1.0 #------------------------------------------------------------------------------- # VNDK Modules @@ -86,11 +67,10 @@ $(foreach lib,$(EXTRA_VENDOR_LIBRARIES),\ #------------------------------------------------------------------------------- include $(CLEAR_VARS) -LOCAL_MODULE := vndk-sp +LOCAL_MODULE := s3ve3g-vndk-extra LOCAL_MODULE_TAGS := optional LOCAL_REQUIRED_MODULES := \ $(addsuffix .vndk-sp-gen,$(VNDK_SP_LIBRARIES)) \ $(addsuffix .vndk-sp-ext-gen,$(VNDK_SP_EXT_LIBRARIES)) \ $(addsuffix .vndk-ext-gen,$(EXTRA_VENDOR_LIBRARIES)) include $(BUILD_PHONY_PACKAGE) -