ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
am: 542a73be66

Change-Id: I1f295e9285f35c5021a343c049e503592d261e3e
This commit is contained in:
Martin Stjernholm 2019-02-13 16:08:58 -08:00 • committed by android-build-merger
commit 33f1fb107b
1 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
rootdir/Android.mk
View file

@ -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)