diff options
| author | Cole Faust <colefaust@google.com> | 2023-10-13 22:15:29 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-10-13 22:15:29 +0000 |
| commit | 43692db7bcc3094f7a0699034eecfc5efabfe0c1 (patch) | |
| tree | 517cfd7d80ac803069c8be1833ef5c340ad851d6 | |
| parent | dc0f5a2e36f029e6ecc7e76798777a83382ebcc2 (diff) | |
| parent | 21c32402a615b63f764aa5c6fd419c8378b3ec74 (diff) | |
| download | yukawa-43692db7bcc3094f7a0699034eecfc5efabfe0c1.tar.gz | |
Use install_symlink to add symlinks am: 92b51f2bbb am: 9246129559 am: 21c32402a6
Original change: https://android-review.googlesource.com/c/device/amlogic/yukawa/+/2786433
Change-Id: If34cde53cced351f0d40e8d8e83db358ca45f92c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | binaries/gpu/Android.bp | 57 | ||||
| -rwxr-xr-x | binaries/gpu/Android.mk | 18 |
2 files changed, 65 insertions, 10 deletions
diff --git a/binaries/gpu/Android.bp b/binaries/gpu/Android.bp new file mode 100644 index 0000000..8423c3f --- /dev/null +++ b/binaries/gpu/Android.bp @@ -0,0 +1,57 @@ + + +install_symlink { + name: "yukawa_libGLES_mali_vulkan_symlink32", + vendor: true, + installed_location: "lib/hw/vulkan.yukawa.so", + symlink_target: "../egl/libGLES_mali.so", +} + +install_symlink { + name: "yukawa_libGLES_mali_vulkan_symlink64", + vendor: true, + installed_location: "lib64/hw/vulkan.yukawa.so", + symlink_target: "../egl/libGLES_mali.so", +} + +install_symlink { + name: "yukawa_libGLES_mali_libOpenCL_symlink32", + vendor: true, + installed_location: "lib/libOpenCL.so", + symlink_target: "libOpenCL.so.1.1", +} + +install_symlink { + name: "yukawa_libGLES_mali_libOpenCL.1_symlink32", + vendor: true, + installed_location: "lib/libOpenCL.so.1", + symlink_target: "libOpenCL.so.1.1", +} + +install_symlink { + name: "yukawa_libGLES_mali_libOpenCL.1.1_symlink32", + vendor: true, + installed_location: "lib/libOpenCL.so.1.1", + symlink_target: "egl/libGLES_mali.so", +} + +install_symlink { + name: "yukawa_libGLES_mali_libOpenCL_symlink64", + vendor: true, + installed_location: "lib64/libOpenCL.so", + symlink_target: "libOpenCL.so.1.1", +} + +install_symlink { + name: "yukawa_libGLES_mali_libOpenCL.1_symlink64", + vendor: true, + installed_location: "lib64/libOpenCL.so.1", + symlink_target: "libOpenCL.so.1.1", +} + +install_symlink { + name: "yukawa_libGLES_mali_libOpenCL.1.1_symlink64", + vendor: true, + installed_location: "lib64/libOpenCL.so.1.1", + symlink_target: "egl/libGLES_mali.so", +}
\ No newline at end of file diff --git a/binaries/gpu/Android.mk b/binaries/gpu/Android.mk index f989461..63de7e5 100755 --- a/binaries/gpu/Android.mk +++ b/binaries/gpu/Android.mk @@ -35,19 +35,17 @@ LOCAL_SHARED_LIBRARIES := android.hardware.graphics.common@1.0 libz libnativewin LOCAL_STRIP_MODULE := false ifeq ($(BOARD_INSTALL_VULKAN),true) -LOCAL_POST_INSTALL_CMD = $(hide) \ - pushd $(dir $(LOCAL_INSTALLED_MODULE))../hw && \ - ln -sf ../egl/$(notdir $(LOCAL_INSTALLED_MODULE)) vulkan.$(TARGET_DEVICE).so && \ - popd; +LOCAL_REQUIRED_MODULES += yukawa_libGLES_mali_vulkan_symlink32 yukawa_libGLES_mali_vulkan_symlink64 endif ifeq ($(BOARD_INSTALL_OPENCL),true) -LOCAL_POST_INSTALL_CMD += \ - pushd $(dir $(LOCAL_INSTALLED_MODULE)).. && \ - ln -sf egl/$(notdir $(LOCAL_INSTALLED_MODULE)) libOpenCL.so.1.1 && \ - ln -sf libOpenCL.so.1.1 libOpenCL.so.1 && \ - ln -sf libOpenCL.so.1.1 libOpenCL.so && \ - popd; +LOCAL_REQUIRED_MODULES += \ + yukawa_libGLES_mali_libOpenCL_symlink32 \ + yukawa_libGLES_mali_libOpenCL.1_symlink32 \ + yukawa_libGLES_mali_libOpenCL.1.1_symlink32 \ + yukawa_libGLES_mali_libOpenCL_symlink64 \ + yukawa_libGLES_mali_libOpenCL.1_symlink64 \ + yukawa_libGLES_mali_libOpenCL.1.1_symlink64 endif include $(BUILD_PREBUILT) |