eyxnos9610: Build with Linaro BSP

* Right now we're just focused on building Graphics, OMX, and
  the legal camera bits. Rest can come later if we want it to.

* The only thing worth noting is that libexynosgscaler was
  available in the A10 BSP, but isn't in the A13 one. While
  we can likely just import it, for now we'll leave it prebuilt
  to keep things easy and get things shipping.

* The whole reason we finally did this was OMX broke with prebuilts
  on Android 14.

Change-Id: I88654b3602d5b077f252e0c2ea0ff9855f902d97

diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 146f27e6929904bf3bc5a2231c9f155a3df2aec2..c4ed5be35bc2cf699e501e6c0d5af286f6475e30 100644 (file)
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -166,3 +166,6 @@ WIFI_HIDL_FEATURE_DUAL_INTERFACE := true
 WPA_SUPPLICANT_VERSION           := VER_0_8_X
 
 PRODUCT_CFI_INCLUDE_PATHS += hardware/samsung_slsi/scsc_wifibt/wpa_supplicant_lib
+
+## BSP (Must be included last)
+include hardware/samsung_slsi-linaro/config/BoardConfig9610.mk

diff --git a/common.mk b/common.mk
index 1c64c2b0ebfe559df38c2308229b6d2069a5e563..67ff1a45c82d65c540764f7ecc1ada680812c5c2 100644 (file)
--- a/common.mk
+++ b/common.mk
@@ -95,6 +95,8 @@ PRODUCT_PACKAGES += \
     android.frameworks.cameraservice.service@2.1.vendor \
     android.hardware.camera.provider@2.4-impl \
     android.hardware.camera.provider@2.4-service \
+    libgiantmscl \
+    libhwjpeg \
     libsensorndkbridge
 
 # ConfigStore
@@ -113,7 +115,17 @@ PRODUCT_PACKAGES += \
     android.hardware.graphics.allocator@2.0-impl \
     android.hardware.graphics.allocator@2.0-service \
     android.hardware.graphics.composer@2.4-service \
-    android.hardware.graphics.mapper@2.0-impl-2.1
+    android.hardware.graphics.mapper@2.0-impl-2.1 \
+    libacryl \
+    libacryl_plugin_slsi_hdr10 \
+    libcsc \
+    libexynosdisplay \
+    libexynosgraphicbuffer \
+    libexynosscaler \
+    libexynosutils \
+    libexynosv4l2 \
+    libion_exynos \
+    libstagefrighthw
 
 # DRM
 PRODUCT_PACKAGES += \
@@ -159,6 +171,10 @@ PRODUCT_PACKAGES += \
 PRODUCT_COPY_FILES += \
     $(COMMON_PATH)/configs/gps/gps.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cfg
 
+# Gralloc
+PRODUCT_PACKAGES += \
+    gralloc.exynos9610
+
 # Graphics
 # Device uses high-density artwork where available
 PRODUCT_AAPT_CONFIG := xlarge
@@ -179,6 +195,10 @@ PRODUCT_PACKAGES += \
 PRODUCT_COPY_FILES += \
     $(COMMON_PATH)/configs/privapp-permissions-hotword.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/privapp-permissions-hotword.xml
 
+# HWC
+PRODUCT_PACKAGES += \
+    hwcomposer.exynos9610
+
 # init
 PRODUCT_COPY_FILES += \
     $(COMMON_PATH)/configs/init/carrier/init.default.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/carrier/init.default.rc \
@@ -237,7 +257,8 @@ PRODUCT_COPY_FILES += \
 # Memtrack
 PRODUCT_PACKAGES += \
     android.hardware.memtrack@1.0-impl \
-    android.hardware.memtrack@1.0-service
+    android.hardware.memtrack@1.0-service \
+    memtrack.exynos9610
 
 # MotoActions
 PRODUCT_PACKAGES += \
@@ -257,6 +278,21 @@ PRODUCT_COPY_FILES += \
 # OMX
 PRODUCT_PACKAGES += \
     android.hardware.media.omx@1.0-service \
+    libExynosOMX_Core \
+    libExynosOMX_Resourcemanager \
+    libGrallocWrapper \
+    libOMX.Exynos.AVC.Decoder \
+    libOMX.Exynos.AVC.Encoder \
+    libOMX.Exynos.HEVC.Decoder \
+    libOMX.Exynos.HEVC.Encoder \
+    libOMX.Exynos.MPEG4.Decoder \
+    libOMX.Exynos.MPEG4.Encoder \
+    libOMX.Exynos.VP8.Decoder \
+    libOMX.Exynos.VP8.Encoder \
+    libOMX.Exynos.VP9.Decoder \
+    libOMX.Exynos.VP9.Encoder \
+    libOMX.Exynos.WMV.Decoder \
+    libepicoperator \
     libstagefright_softomx
 
 # Overlays

diff --git a/lineage.dependencies b/lineage.dependencies
index 1156d2a0fe38d9d366e809dd205db3837218b7d5..dc9f2fff3ebf30daf17d4877db0ca8374a3abc43 100644 (file)
--- a/lineage.dependencies
+++ b/lineage.dependencies
@@ -19,6 +19,30 @@
         "repository": "android_hardware_samsung_slsi_libbt",
         "target_path": "hardware/samsung_slsi/libbt"
     },
+    {
+        "repository": "android_hardware_samsung_slsi-linaro_config",
+        "target_path": "hardware/samsung_slsi-linaro/config"
+    },
+    {
+        "repository": "android_hardware_samsung_slsi-linaro_exynos",
+        "target_path": "hardware/samsung_slsi-linaro/exynos"
+    },
+    {
+        "repository": "android_hardware_samsung_slsi-linaro_exynos5",
+        "target_path": "hardware/samsung_slsi-linaro/exynos5"
+    },
+    {
+        "repository": "android_hardware_samsung_slsi-linaro_graphics",
+        "target_path": "hardware/samsung_slsi-linaro/graphics"
+    },
+    {   
+        "repository": "android_hardware_samsung_slsi-linaro_interfaces",
+        "target_path": "hardware/samsung_slsi-linaro/interfaces"
+    },
+    {
+        "repository": "android_hardware_samsung_slsi-linaro_openmax",
+        "target_path": "hardware/samsung_slsi-linaro/openmax"
+    },
     {
         "repository": "android_hardware_samsung_slsi_scsc_wifibt_wifi_hal",
         "target_path": "hardware/samsung_slsi/scsc_wifibt/wifi_hal"

diff --git a/proprietary-files-vendor.txt b/proprietary-files-vendor.txt
index e52fe554332950f939bbee8205fd78cea07332d7..690bcf49cfeb5b063259a3d00e2bc60350238fca 100644 (file)
--- a/proprietary-files-vendor.txt
+++ b/proprietary-files-vendor.txt
@@ -19,9 +19,7 @@ vendor/lib/libexynoscamera_hifills_plugin.so
 vendor/lib/libexynoscamera_plugin.so
 vendor/lib/libexynoscamera_plugin_utils.so
 vendor/lib/libexynoscamera_vdis_plugin.so
-vendor/lib/libgiantmscl.so
 vendor/lib/libhifills.so
-vendor/lib/libhwjpeg.so
 vendor/lib/libvdis.so
 vendor/lib/libyuvrepro.so
 vendor/lib64/libENF.so
@@ -30,9 +28,7 @@ vendor/lib64/libexynoscamera_hifills_plugin.so
 vendor/lib64/libexynoscamera_plugin.so
 vendor/lib64/libexynoscamera_plugin_utils.so
 vendor/lib64/libexynoscamera_vdis_plugin.so
-vendor/lib64/libgiantmscl.so
 vendor/lib64/libhifills.so
-vendor/lib64/libhwjpeg.so
 vendor/lib64/libvdis.so
 vendor/lib64/libyuvrepro.so
 
@@ -124,35 +120,9 @@ vendor/lib64/vendor.samsung.hardware.gnss@1.0.so
 
 ## Graphics
 vendor/lib/egl/libGLES_mali.so
-vendor/lib/hw/gralloc.exynos9610.so
-vendor/lib/hw/hwcomposer.exynos9610.so
-vendor/lib/libExynosHWCService.so
-vendor/lib/libGrallocWrapper.so
-vendor/lib/libacryl.so
-vendor/lib/libacryl_plugin_slsi_hdr10.so
-vendor/lib/libcsc.so
-vendor/lib/libexynosdisplay.so
-vendor/lib/libexynosgraphicbuffer.so
 vendor/lib/libexynosgscaler.so
-vendor/lib/libexynosscaler.so
-vendor/lib/libexynosutils.so
-vendor/lib/libexynosv4l2.so
-vendor/lib/libion_exynos.so
 vendor/lib64/egl/libGLES_mali.so
-vendor/lib64/hw/gralloc.exynos9610.so
-vendor/lib64/hw/hwcomposer.exynos9610.so
-vendor/lib64/libExynosHWCService.so
-vendor/lib64/libGrallocWrapper.so
-vendor/lib64/libacryl.so
-vendor/lib64/libacryl_plugin_slsi_hdr10.so
-vendor/lib64/libcsc.so
-vendor/lib64/libexynosdisplay.so
-vendor/lib64/libexynosgraphicbuffer.so
 vendor/lib64/libexynosgscaler.so
-vendor/lib64/libexynosscaler.so
-vendor/lib64/libexynosutils.so
-vendor/lib64/libexynosv4l2.so
-vendor/lib64/libion_exynos.so
 
 ## Keymaster
 vendor/lib/hw/keystore.exynos9610.so
@@ -168,10 +138,6 @@ vendor/lib64/libstrongswan.so
 vendor/bin/hw/samsung.hardware.media.c2@1.1-default-service
 vendor/etc/init/samsung.hardware.media.c2@1.1-default-service.rc
 
-## Memtrack
-vendor/lib/hw/memtrack.exynos9610.so
-vendor/lib64/hw/memtrack.exynos9610.so
-
 ## Mobicore
 vendor/app/mcRegistry/00060308060501020000000000000000.tlbin
 vendor/app/mcRegistry/07010000000000000000000000000000.tlbin
@@ -188,38 +154,6 @@ vendor/lib64/libMcClient.so
 ## NFC
 vendor/etc/sec_s3nrn82_rfreg.bin
 
-## OMX
-vendor/lib/libExynosOMX_Core.so
-vendor/lib/libExynosOMX_Resourcemanager.so
-vendor/lib/libepicoperator.so
-vendor/lib/libstagefrighthw.so
-vendor/lib/omx/libOMX.Exynos.AVC.Decoder.so
-vendor/lib/omx/libOMX.Exynos.AVC.Encoder.so
-vendor/lib/omx/libOMX.Exynos.HEVC.Decoder.so
-vendor/lib/omx/libOMX.Exynos.HEVC.Encoder.so
-vendor/lib/omx/libOMX.Exynos.MPEG4.Decoder.so
-vendor/lib/omx/libOMX.Exynos.MPEG4.Encoder.so
-vendor/lib/omx/libOMX.Exynos.VP8.Decoder.so
-vendor/lib/omx/libOMX.Exynos.VP8.Encoder.so
-vendor/lib/omx/libOMX.Exynos.VP9.Decoder.so
-vendor/lib/omx/libOMX.Exynos.VP9.Encoder.so
-vendor/lib/omx/libOMX.Exynos.WMV.Decoder.so
-vendor/lib64/libExynosOMX_Core.so
-vendor/lib64/libExynosOMX_Resourcemanager.so
-vendor/lib64/libepicoperator.so
-vendor/lib64/libstagefrighthw.so
-vendor/lib64/omx/libOMX.Exynos.AVC.Decoder.so
-vendor/lib64/omx/libOMX.Exynos.AVC.Encoder.so
-vendor/lib64/omx/libOMX.Exynos.HEVC.Decoder.so
-vendor/lib64/omx/libOMX.Exynos.HEVC.Encoder.so
-vendor/lib64/omx/libOMX.Exynos.MPEG4.Decoder.so
-vendor/lib64/omx/libOMX.Exynos.MPEG4.Encoder.so
-vendor/lib64/omx/libOMX.Exynos.VP8.Decoder.so
-vendor/lib64/omx/libOMX.Exynos.VP8.Encoder.so
-vendor/lib64/omx/libOMX.Exynos.VP9.Decoder.so
-vendor/lib64/omx/libOMX.Exynos.VP9.Encoder.so
-vendor/lib64/omx/libOMX.Exynos.WMV.Decoder.so
-
 ## Power
 vendor/lib/hw/power.exynos9610.so
 vendor/lib64/hw/power.exynos9610.so