diff options
| author | Neil Fuller <nfuller@google.com> | 2019-03-15 19:00:36 +0000 |
|---|---|---|
| committer | Neil Fuller <nfuller@google.com> | 2019-03-15 19:05:05 +0000 |
| commit | 3b0da85b2229e7494c52279db973e40cddc3e189 (patch) | |
| tree | 56f92729c0493532636f9fe13016b86735144fd6 | |
| parent | 0e5b74deff69312063e9f71d3b62f1f806b29526 (diff) | |
| download | system_core-3b0da85b2229e7494c52279db973e40cddc3e189.tar.gz system_core-3b0da85b2229e7494c52279db973e40cddc3e189.tar.bz2 system_core-3b0da85b2229e7494c52279db973e40cddc3e189.zip | |
Address syntax / error case nits
Observe some best practices in the APEX symlink
shell commands. No functional changes intended except with error
handling.
Bug: 128687472
Bug: 124106384
Bug: 122985829
Bug: 128249030
Test: make installclean / make droid / inspect one symlink
Change-Id: I099fed5ac8f25cc3911ce0e7ea2b9f74c2172193
| -rw-r--r-- | rootdir/Android.mk | 8 |
1 files changed, 4 insertions, 4 deletions
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. |