commit ab466018b1cf540eed1f1fab8a8a44ee740c10fe
author Neil Fuller <nfuller@google.com> Tue Mar 19 02:50:30 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Mar 19 02:50:30 2019 -0700
tree 03b94d3dfa710b8cc99193843a174d550811b65b
parent 1a356fdb84f55a3d4029e936c8529935c90df85c
parent cece05b882b094c61c5b13ac9c03033fc9a64796

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

Change-Id: Ia67f090ccc6c22d3c2ed1e25921094c9d2de5910

rootdir/Android.mk

diff --git a/rootdir/Android.mk b/rootdir/Android.mk
index e0b291d..54b019e 100644
--- a/rootdir/Android.mk
+++ b/rootdir/Android.mk
@@ -220,10 +220,10 @@
 # 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 @@
   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.