diff --git a/rootdir/Android.mk b/rootdir/Android.mk index cbbc7109c..123fdd787 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -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)