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

Merge "Address syntax / error case nits" am: ed6b5177e2

Browse source 
am: 6ac873c3b9

Change-Id: Ia4ff7863f33c0637a0a58dbdac55bf6152a163b9
This commit is contained in:
Neil Fuller 2019-03-19 02:54:38 -07:00 • committed by android-build-merger
commit d836b1dca9
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
rootdir/Android.mk
View file

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