Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f77dbfe authored by Martin Stjernholm's avatar Martin Stjernholm
Browse files

Add compat symlinks into the Runtime APEX for the ART binaries. 

This is a precaution in case there are dependencies on the binaries in the
old location. b/124106384 tracks eliminating them (if any).

Test: Flash and check symlinks are there with adb shell ls -l system/bin
Test: adb shell system/bin/<binary>
Bug: 113373927
Bug: 124106384
Change-Id: Ib4102fe55117611f68184102e68a10ea47de0065
parent 18de1350

rootdir/Android.mk

+17 −0
Original line number Diff line number Diff line
@@ -42,6 +42,23 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/init 
LOCAL_POST_INSTALL_CMD = mkdir -p $(TARGET_OUT)/usr && rm -rf $(TARGET_OUT)/usr/icu

LOCAL_POST_INSTALL_CMD += ; ln -sf /apex/com.android.runtime/etc/icu $(TARGET_OUT)/usr/icu



# TODO(b/124106384): Clean up compat symlinks for ART binaries.

ART_BINARIES= \

  dalvikvm32 \

  dalvikvm64 \

  dex2oat \

  dexdiag \

  dexdump \

  dexlist \

  dexoptanalyzer \

  oatdump \

  profman \



$(foreach b,$(ART_BINARIES), \

  $(eval LOCAL_POST_INSTALL_CMD += \

    ; ln -sf /apex/com.android.runtime/bin/$(b) $(TARGET_OUT)/bin/$(b)) \

)



# End of runtime APEX compatibilty.



include $(BUILD_PREBUILT)