diff --git a/rootdir/Android.mk b/rootdir/Android.mk index e0b291d2a..54b019eba 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -220,10 +220,10 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_ETC) # A symlink can't overwrite a directory and the /system/usr/icu directory once # existed so the required structure must be created whatever we find. 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= \ +ART_BINARIES := \ dalvikvm \ dalvikvm32 \ dalvikvm64 \ @@ -235,10 +235,10 @@ ART_BINARIES= \ oatdump \ profman \ -LOCAL_POST_INSTALL_CMD += ; mkdir -p $(TARGET_OUT)/bin +LOCAL_POST_INSTALL_CMD += && mkdir -p $(TARGET_OUT)/bin $(foreach b,$(ART_BINARIES), \ $(eval LOCAL_POST_INSTALL_CMD += \ - ; ln -sf /apex/com.android.runtime/bin/$(b) $(TARGET_OUT)/bin/$(b)) \ + && ln -sf /apex/com.android.runtime/bin/$(b) $(TARGET_OUT)/bin/$(b)) \ ) # End of runtime APEX compatibilty.