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

Commit 33f1fb10 authored by Martin Stjernholm's avatar Martin Stjernholm Committed by android-build-merger
Browse files

Merge "Add compat symlinks into the Runtime APEX for the ART binaries." am: 48c6d139 

am: 542a73be

Change-Id: I1f295e9285f35c5021a343c049e503592d261e3e
parents c5edd1b1 542a73be

rootdir/Android.mk

+17 −0
Original line number Original line 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 = 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

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.

# End of runtime APEX compatibilty.





include $(BUILD_PREBUILT)

include $(BUILD_PREBUILT)