Add more libs into generic AOSP system image

Includes:
- more HIDL interfaces
- explicitly specify all LL-NDK and SP-NDK (currently only
  libandroid_net is missing)
- add liblzma and libyuv

Bug: 38339299
Test: build aosp_arm64_ab and pass
Change-Id: Ic67d47990cf6b4ab51e1b74f0fed85e60ce3a817

diff --git a/target/product/treble_common.mk b/target/product/treble_common.mk
index 92876ef..d4e8dc1 100644 (file)
--- a/target/product/treble_common.mk
+++ b/target/product/treble_common.mk
@@ -22,6 +22,7 @@ PRODUCT_FULL_TREBLE_OVERRIDE := true
 #   from the framework. However, we list them all here to make it explicit and
 #   prevent possible mistake.
 PRODUCT_PACKAGES := \
+    android.frameworks.displayservice@1.0 \
     android.frameworks.schedulerservice@1.0 \
     android.frameworks.sensorservice@1.0 \
     android.frameworks.vr.composer@1.0 \
@@ -29,6 +30,10 @@ PRODUCT_PACKAGES := \
     android.hardware.audio.common@2.0 \
     android.hardware.audio.common@2.0-util \
     android.hardware.audio.effect@2.0 \
+    android.hardware.automotive.evs@1.0 \
+    android.hardware.automotive.vehicle@2.0 \
+    android.hardware.automotive.vehicle@2.0-manager-lib-shared \
+    android.hardware.automotive.vehicle@2.1 \
     android.hardware.biometrics.fingerprint@2.1 \
     android.hardware.bluetooth@1.0 \
     android.hardware.boot@1.0 \
@@ -37,6 +42,7 @@ PRODUCT_PACKAGES := \
     android.hardware.camera.common@1.0 \
     android.hardware.camera.device@1.0 \
     android.hardware.camera.device@3.2 \
+    android.hardware.camera.metadata@3.2 \
     android.hardware.camera.provider@2.4 \
     android.hardware.configstore-utils \
     android.hardware.configstore@1.0 \
@@ -114,6 +120,7 @@ PRODUCT_PACKAGES += \
     libldacBT_abr \
     libldacBT_enc \
     liblz4 \
+    liblzma \
     libmdnssd \
     libmemtrack \
     libmemunreachable \
@@ -151,12 +158,34 @@ PRODUCT_PACKAGES += \
     libvorbisidec \
     libwebrtc_audio_preprocessing \
     libxml2 \
+    libyuv \
     libziparchive \
 
 # VNDK-SP:
 PRODUCT_PACKAGES += \
     vndk-sp \
 
+# LL-VNDK:
+PRODUCT_PACKAGES += \
+    libandroid_net \
+    libc \
+    libdl \
+    liblog \
+    libm \
+    libstdc++ \
+    libvndksupport \
+    libz \
+
+# SP-NDK:
+PRODUCT_PACKAGES += \
+    libEGL \
+    libGLESv1_CM \
+    libGLESv2 \
+    libGLESv3 \
+    libnativewindow \
+    libsync \
+    libvulkan \
+
 PRODUCT_SYSTEM_VERITY_PARTITION := /dev/block/bootdevice/by-name/system
 
 # Wifi: