diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index f885166..7462f27 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -27,6 +27,9 @@ TARGET_2ND_CPU_VARIANT_RUNTIME := cortex-a53 # Audio TARGET_EXCLUDES_AUDIOFX := true +# Build system +BUILD_BROKEN_DUP_RULES := true + # Camera TARGET_CAMERA_BOOTTIME_TIMESTAMP := true diff --git a/configs/placeholder b/configs/placeholder new file mode 100644 index 0000000..e69de29 diff --git a/configs/vndkcore.libraries.29.txt b/configs/vndkcore.libraries.29.txt new file mode 100644 index 0000000..66357f2 --- /dev/null +++ b/configs/vndkcore.libraries.29.txt @@ -0,0 +1,222 @@ +android.frameworks.cameraservice.common@2.0.so +android.frameworks.cameraservice.device@2.0.so +android.frameworks.cameraservice.service@2.0.so +android.frameworks.displayservice@1.0.so +android.frameworks.schedulerservice@1.0.so +android.frameworks.sensorservice@1.0.so +android.frameworks.stats@1.0.so +android.frameworks.vr.composer@1.0.so +android.hardware.atrace@1.0.so +android.hardware.audio.common@2.0.so +android.hardware.audio.common@4.0.so +android.hardware.audio.common@5.0.so +android.hardware.audio.effect@2.0.so +android.hardware.audio.effect@4.0.so +android.hardware.audio.effect@5.0.so +android.hardware.audio@2.0.so +android.hardware.audio@4.0.so +android.hardware.audio@5.0.so +android.hardware.authsecret@1.0.so +android.hardware.automotive.audiocontrol@1.0.so +android.hardware.automotive.evs@1.0.so +android.hardware.automotive.vehicle@2.0.so +android.hardware.biometrics.face@1.0.so +android.hardware.biometrics.fingerprint@2.1.so +android.hardware.bluetooth.a2dp@1.0.so +android.hardware.bluetooth.audio@2.0.so +android.hardware.bluetooth@1.0.so +android.hardware.boot@1.0.so +android.hardware.broadcastradio@1.0.so +android.hardware.broadcastradio@1.1.so +android.hardware.broadcastradio@2.0.so +android.hardware.camera.common@1.0.so +android.hardware.camera.device@1.0.so +android.hardware.camera.device@3.2.so +android.hardware.camera.device@3.3.so +android.hardware.camera.device@3.4.so +android.hardware.camera.device@3.5.so +android.hardware.camera.metadata@3.2.so +android.hardware.camera.metadata@3.3.so +android.hardware.camera.metadata@3.4.so +android.hardware.camera.provider@2.4.so +android.hardware.camera.provider@2.5.so +android.hardware.cas.native@1.0.so +android.hardware.cas@1.0.so +android.hardware.cas@1.1.so +android.hardware.configstore-utils.so +android.hardware.configstore@1.0.so +android.hardware.configstore@1.1.so +android.hardware.confirmationui-support-lib.so +android.hardware.confirmationui@1.0.so +android.hardware.contexthub@1.0.so +android.hardware.drm@1.0.so +android.hardware.drm@1.1.so +android.hardware.drm@1.2.so +android.hardware.dumpstate@1.0.so +android.hardware.fastboot@1.0.so +android.hardware.gatekeeper@1.0.so +android.hardware.gnss.measurement_corrections@1.0.so +android.hardware.gnss.visibility_control@1.0.so +android.hardware.gnss@1.0.so +android.hardware.gnss@1.1.so +android.hardware.gnss@2.0.so +android.hardware.graphics.allocator@2.0.so +android.hardware.graphics.allocator@3.0.so +android.hardware.graphics.bufferqueue@1.0.so +android.hardware.graphics.bufferqueue@2.0.so +android.hardware.graphics.composer@2.1.so +android.hardware.graphics.composer@2.2.so +android.hardware.graphics.composer@2.3.so +android.hardware.health.storage@1.0.so +android.hardware.health@1.0.so +android.hardware.health@2.0.so +android.hardware.input.classifier@1.0.so +android.hardware.input.common@1.0.so +android.hardware.ir@1.0.so +android.hardware.keymaster@3.0.so +android.hardware.keymaster@4.0.so +android.hardware.light@2.0.so +android.hardware.media.bufferpool@1.0.so +android.hardware.media.bufferpool@2.0.so +android.hardware.media.c2@1.0.so +android.hardware.media.omx@1.0.so +android.hardware.media@1.0.so +android.hardware.memtrack@1.0.so +android.hardware.neuralnetworks@1.0.so +android.hardware.neuralnetworks@1.1.so +android.hardware.neuralnetworks@1.2.so +android.hardware.nfc@1.0.so +android.hardware.nfc@1.1.so +android.hardware.nfc@1.2.so +android.hardware.oemlock@1.0.so +android.hardware.power.stats@1.0.so +android.hardware.power@1.0.so +android.hardware.power@1.1.so +android.hardware.power@1.2.so +android.hardware.power@1.3.so +android.hardware.radio.config@1.0.so +android.hardware.radio.config@1.1.so +android.hardware.radio.config@1.2.so +android.hardware.radio.deprecated@1.0.so +android.hardware.radio@1.0.so +android.hardware.radio@1.1.so +android.hardware.radio@1.2.so +android.hardware.radio@1.3.so +android.hardware.radio@1.4.so +android.hardware.secure_element@1.0.so +android.hardware.secure_element@1.1.so +android.hardware.sensors@1.0.so +android.hardware.sensors@2.0.so +android.hardware.soundtrigger@2.0.so +android.hardware.soundtrigger@2.0-core.so +android.hardware.soundtrigger@2.1.so +android.hardware.soundtrigger@2.2.so +android.hardware.tetheroffload.config@1.0.so +android.hardware.tetheroffload.control@1.0.so +android.hardware.thermal@1.0.so +android.hardware.thermal@1.1.so +android.hardware.thermal@2.0.so +android.hardware.tv.cec@1.0.so +android.hardware.tv.cec@2.0.so +android.hardware.tv.input@1.0.so +android.hardware.usb.gadget@1.0.so +android.hardware.usb@1.0.so +android.hardware.usb@1.1.so +android.hardware.usb@1.2.so +android.hardware.vibrator@1.0.so +android.hardware.vibrator@1.1.so +android.hardware.vibrator@1.2.so +android.hardware.vibrator@1.3.so +android.hardware.vr@1.0.so +android.hardware.weaver@1.0.so +android.hardware.wifi.hostapd@1.0.so +android.hardware.wifi.hostapd@1.1.so +android.hardware.wifi.offload@1.0.so +android.hardware.wifi.supplicant@1.0.so +android.hardware.wifi.supplicant@1.1.so +android.hardware.wifi.supplicant@1.2.so +android.hardware.wifi@1.0.so +android.hardware.wifi@1.1.so +android.hardware.wifi@1.2.so +android.hardware.wifi@1.3.so +android.hidl.allocator@1.0.so +android.hidl.memory.block@1.0.so +android.hidl.token@1.0.so +android.hidl.token@1.0-utils.so +android.system.net.netd@1.0.so +android.system.net.netd@1.1.so +android.system.suspend@1.0.so +android.system.wifi.keystore@1.0.so +libadf.so +libaudioroute.so +libaudioutils.so +libbinder.so +libcamera_client.so +libcamera_metadata.so +libcap.so +libclang_rt.scudo-aarch64-android.so +libclang_rt.scudo-arm-android.so +libclang_rt.scudo_minimal-aarch64-android.so +libclang_rt.scudo_minimal-arm-android.so +libclang_rt.ubsan_minimal-aarch64-android.so +libclang_rt.ubsan_minimal-arm-android.so +libclang_rt.ubsan_standalone-aarch64-android.so +libclang_rt.ubsan_standalone-arm-android.so +libcn-cbor.so +libcodec2.so +libcrypto.so +libcrypto_utils.so +libcurl.so +libdiskconfig.so +libdumpstateutil.so +libevent.so +libexif.so +libexpat.so +libfmq.so +libgatekeeper.so +libgui.so +libhardware_legacy.so +libhidlallocatorutils.so +libhidlcache.so +libjpeg.so +libkeymaster_messages.so +libkeymaster_portable.so +libldacBT_abr.so +libldacBT_enc.so +liblz4.so +libmedia_helper.so +libmedia_omx.so +libmemtrack.so +libminijail.so +libmkbootimg_abi_check.so +libnetutils.so +libnl.so +libpcre2.so +libpiex.so +libpng.so +libpower.so +libprocinfo.so +libprotobuf-cpp-full.so +libprotobuf-cpp-lite.so +libpuresoftkeymasterdevice.so +libradio_metadata.so +libselinux.so +libsoftkeymasterdevice.so +libspeexresampler.so +libsqlite.so +libssl.so +libstagefright_bufferpool@2.0.so +libstagefright_bufferqueue_helper.so +libstagefright_foundation.so +libstagefright_omx.so +libstagefright_omx_utils.so +libstagefright_xmlparser.so +libsysutils.so +libtinyalsa.so +libtinyxml2.so +libui.so +libusbhost.so +libwifi-system-iface.so +libxml2.so +libyuv.so +libziparchive.so diff --git a/configs/vndkprivate.libraries.29.txt b/configs/vndkprivate.libraries.29.txt new file mode 100644 index 0000000..99faf5a --- /dev/null +++ b/configs/vndkprivate.libraries.29.txt @@ -0,0 +1,5 @@ +libbacktrace.so +libbinderthreadstate.so +libblas.so +libcompiler_rt.so +libft2.so diff --git a/rootdir/Android.mk b/rootdir/Android.mk index 625e217..e2c4b37 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -23,11 +23,3 @@ LOCAL_MODULE_CLASS := ETC LOCAL_SRC_FILES := etc/fstab.enableswap LOCAL_MODULE_PATH := $(TARGET_OUT_ETC) include $(BUILD_PREBUILT) - -include $(CLEAR_VARS) -LOCAL_MODULE := sys.sh -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := ETC -LOCAL_SRC_FILES := bin/sys.sh -LOCAL_MODULE_PATH := $(TARGET_OUT_EXECUTABLES) -include $(BUILD_PREBUILT) diff --git a/rootdir/bin/sys.sh b/rootdir/bin/sys.sh deleted file mode 100644 index fc01330..0000000 --- a/rootdir/bin/sys.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/sbin/sh -echo "$(grep -v libgui.so system/system/system_ext/apex/com.android.vndk.v29/etc/vndkprivate.libraries.29.txt)" > system/system/system_ext/apex/com.android.vndk.v29/etc/vndkprivate.libraries.29.txt -echo libcamera_client.so >> system/system/system_ext/apex/com.android.vndk.v29/etc/vndkcore.libraries.29.txt -rm -f system/system/system_ext/apex/com.android.vndk.v29/lib/libstagefright_foundation.so diff --git a/universal7904-common.mk b/universal7904-common.mk index 71c6783..78e8d8e 100644 --- a/universal7904-common.mk +++ b/universal7904-common.mk @@ -21,8 +21,7 @@ TARGET_SCREEN_WIDTH := 1080 PRODUCT_PACKAGES += \ init.universal7904.rc \ init.usb_accessory.rc \ - fstab.enableswap \ - sys.sh + fstab.enableswap # NFC PRODUCT_PACKAGES += \ @@ -76,3 +75,8 @@ PRODUCT_PACKAGES += \ # VNDK PRODUCT_EXTRA_VNDK_VERSIONS := 29 + +PRODUCT_COPY_FILES += \ + $(LOCAL_PATH)/configs/vndkcore.libraries.29.txt:system/system_ext/apex/com.android.vndk.v29/etc/vndkcore.libraries.29.txt \ + $(LOCAL_PATH)/configs/vndkprivate.libraries.29.txt:system/system_ext/apex/com.android.vndk.v29/etc/vndkprivate.libraries.29.txt \ + $(LOCAL_PATH)/configs/placeholder:system/system_ext/apex/com.android.vndk.v29/lib/libstagefright_foundation.so