From 91d52d50a5ce8e2a4d612d0128d49dd53d23a356 Mon Sep 17 00:00:00 2001 From: "Kevin F. Haggerty" Date: Fri, 29 Dec 2017 11:55:55 -0700 Subject: [PATCH] msm8226-common: Make the common tree more common * Compare things that are used in s3ve, ms01, kmini3g , and matisse wifi and move the stuff that's truly common to here. This will greatly ease O bring-up of the child trees. * Also do a bit of cleanup while we are at it. Change-Id: I8fc5a099a348fa7feb502e3afe9b43df6e22d00b --- BoardConfigCommon.mk | 16 +++- compatibility_matrix.xml | 59 +++++++++++++++ manifest.xml | 153 +++++++++++++++++++++++++++++++++++++++ msm8226.mk | 53 ++++++++++---- 4 files changed, 264 insertions(+), 17 deletions(-) create mode 100644 compatibility_matrix.xml create mode 100644 manifest.xml diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index b60c716..13e5d1e 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -20,8 +20,11 @@ VENDOR_PATH := device/samsung/msm8226-common TARGET_SPECIFIC_HEADER_PATH := $(VENDOR_PATH)/include # Architecture +BOARD_USES_QCOM_HARDWARE := true TARGET_CPU_MEMCPY_BASE_OPT_DISABLE := true TARGET_CPU_VARIANT := krait +BOARD_GLOBAL_CFLAGS += -mfpu=neon -mfloat-abi=softfp +BOARD_GLOBAL_CPPFLAGS += -mfpu=neon -mfloat-abi=softfp # Audio AUDIO_FEATURE_ENABLED_LOW_LATENCY_CAPTURE := true @@ -53,6 +56,8 @@ BOARD_RIL_CLASS := ../../../$(VENDOR_PATH)/ril # Display NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3 OVERRIDE_RS_DRIVER := libRSDriver_adreno.so +TARGET_USES_C2D_COMPOSITION := true +TARGET_USES_ION := true # Shader cache config options # Maximum size of the GLES Shaders that can be cached for reuse. @@ -64,13 +69,13 @@ MAX_EGL_CACHE_KEY_SIZE := 12*1024 # of the device. MAX_EGL_CACHE_SIZE := 2048*1024 -# FM -AUDIO_FEATURE_ENABLED_FM := true -TARGET_QCOM_NO_FM_FIRMWARE := true - # Fonts EXTENDED_FONT_FOOTPRINT := true +# HIDL +DEVICE_MANIFEST_FILE := device/samsung/msm8226-common/manifest.xml +DEVICE_MATRIX_FILE := device/samsung/msm8226-common/compatibility_matrix.xml + # SELinux include device/samsung/msm8226-common/sepolicy/sepolicy.mk @@ -96,6 +101,9 @@ USE_CLANG_PLATFORM_BUILD := true # Properties (reset them here, include more in device if needed) TARGET_SYSTEM_PROP := $(VENDOR_PATH)/system.prop +# Time services +BOARD_USES_QC_TIME_SERVICES := true + # Basic dexpreopt ifeq ($(HOST_OS),linux) ifneq ($(TARGET_BUILD_VARIANT),eng) diff --git a/compatibility_matrix.xml b/compatibility_matrix.xml new file mode 100644 index 0000000..3082485 --- /dev/null +++ b/compatibility_matrix.xml @@ -0,0 +1,59 @@ + + + android.frameworks.schedulerservice + 1.0 + + ISchedulingPolicyService + default + + + + android.frameworks.sensorservice + 1.0 + + ISensorManager + default + + + + android.hidl.allocator + 1.0 + + IAllocator + ashmem + + + + android.hidl.manager + 1.0 + + IServiceManager + default + + + + android.hidl.memory + 1.0 + + IMapper + ashmem + + + + android.hidl.token + 1.0 + + ITokenManager + default + + + + android.system.wifi.keystore + 1.0 + + IKeystore + default + + + + diff --git a/manifest.xml b/manifest.xml new file mode 100644 index 0000000..4b25961 --- /dev/null +++ b/manifest.xml @@ -0,0 +1,153 @@ + + + android.hardware.audio + passthrough + 2.0 + + IDevicesFactory + default + + + + android.hardware.audio.effect + passthrough + 2.0 + + IEffectsFactory + default + + + + android.hardware.bluetooth + passthrough + 1.0 + + IBluetoothHci + default + + + + android.hardware.configstore + hwbinder + 1.0 + + ISurfaceFlingerConfigs + default + + + + android.hardware.drm + hwbinder + 1.0 + + ICryptoFactory + widevine + default + + + IDrmFactory + widevine + default + + + + android.hardware.gnss + passthrough + 1.0 + + IGnss + default + + + + android.hardware.graphics.allocator + hwbinder + 2.0 + + IAllocator + default + + + + android.hardware.graphics.composer + passthrough + + 2.1 + + IComposer + default + + + + android.hardware.graphics.mapper + passthrough + 2.0 + + IMapper + default + + + + android.hardware.keymaster + passthrough + 3.0 + + IKeymasterDevice + default + + + + android.hardware.memtrack + passthrough + 1.0 + + IMemtrack + default + + + + android.hardware.power + passthrough + 1.0 + + IPower + default + + + + android.hardware.sensors + passthrough + 1.0 + + ISensors + default + + + + android.hardware.usb + hwbinder + 1.0 + + IUsb + default + + + + android.hardware.wifi + hwbinder + 1.1 + + IWifi + default + + + + android.hardware.wifi.supplicant + hwbinder + 1.0 + + ISupplicant + default + + + diff --git a/msm8226.mk b/msm8226.mk index fd9fd06..6c16422 100644 --- a/msm8226.mk +++ b/msm8226.mk @@ -52,6 +52,21 @@ PRODUCT_PACKAGES += \ init.qcom.usb.rc \ init.recovery.qcom.rc \ ueventd.qcom.rc + +# System properties +PRODUCT_PROPERTY_OVERRIDES += \ + audio.offload.buffer.size.kb=32 \ + audio.offload.gapless.enabled=false \ + av.offload.enable=true + +PRODUCT_PROPERTY_OVERRIDES += \ + ro.opengles.version=196608 + +PRODUCT_PROPERTY_OVERRIDES += \ + persist.timed.enable=true + +PRODUCT_PROPERTY_OVERRIDES += \ + ro.vendor.extension_library=/vendor/lib/libqc-opt.so # Audio PRODUCT_PACKAGES += \ @@ -68,6 +83,11 @@ PRODUCT_PACKAGES += \ libqcomvisualizer \ libqcomvoiceprocessing \ tinymix + +# Bluetooth +PRODUCT_PACKAGES += \ + android.hardware.bluetooth@1.0-impl \ + libbt-vendor # Camera PRODUCT_PACKAGES += \ @@ -96,19 +116,14 @@ PRODUCT_PACKAGES += \ hwcomposer.msm8226 \ memtrack.msm8226 -# Ebtables +# DRM PRODUCT_PACKAGES += \ - ebtables \ - ethertypes \ - libebtc - -# FM -PRODUCT_PACKAGES += \ - FMRadio \ - libfmjni + android.hardware.drm@1.0-impl \ + android.hardware.drm@1.0-service # GPS PRODUCT_PACKAGES += \ + android.hardware.gnss@1.0-impl \ gps.msm8226 PRODUCT_COPY_FILES += \ @@ -122,6 +137,10 @@ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/keylayout/Button_Jack.kl:system/usr/keylayout/Button_Jack.kl \ $(LOCAL_PATH)/keylayout/synaptics_rmi4_i2c.kl:system/usr/keylayout/synaptics_rmi4_i2c.kl +# Keymaster +PRODUCT_PACKAGES += \ + android.hardware.keymaster@3.0-impl + # Keystore PRODUCT_PACKAGES += \ keystore.msm8226 @@ -150,19 +169,27 @@ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/seccomp/mediacodec.policy:system/vendor/etc/seccomp_policy/mediacodec.policy \ $(LOCAL_PATH)/seccomp/mediaextractor.policy:system/vendor/etc/seccomp_policy/mediaextractor.policy +# Sensors +PRODUCT_PACKAGES += \ + android.hardware.sensors@1.0-impl + +# USB +PRODUCT_PACKAGES += \ + android.hardware.usb@1.0-service + # Wifi PRODUCT_PACKAGES += \ dhcpcd.conf \ hostapd \ + wificond \ wpa_supplicant \ - wpa_supplicant.conf + wpa_supplicant.conf \ + libwpa_client \ + android.hardware.wifi@1.0-service PRODUCT_PACKAGES += \ libcurl \ - libqsap_sdk \ - libQWiFiSoftApCfg \ libwcnss_qmi \ wcnss_service - # Inherit from qcom-common $(call inherit-product, device/samsung/qcom-common/qcom-common.mk)