commit dc3b8521256eaec189e8dd6335df40fd2493adb1
author Dan Willemsen <dwillemsen@google.com> Wed Mar 23 15:31:32 2016 -0700
committer Dan Willemsen <dwillemsen@google.com> Wed Mar 23 15:31:32 2016 -0700
tree a2d0d50f3c26ac182f66ef0110945e2b6baa5b78
parent 775c73f6474522fdb7f4496ad22762d6d1b71702
parent 8416096fe88567630cece9213fb2583c4149b019

resolve merge conflicts of 8416096 to nyc-dev-plus-aosp

Change-Id: I1638601fe84dda01bf52c59eb6c976bc1fe37498

Android.mk

diff --git a/Android.mk b/Android.mk
index 59b2a46..aa2aa57 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1048,10 +1048,8 @@
 include $(BUILD_DROIDDOC)
 
 static_doc_index_redirect := $(out_dir)/index.html
-$(static_doc_index_redirect): \
-	$(LOCAL_PATH)/docs/docs-preview-index.html | $(ACP)
-	$(hide) mkdir -p $(dir $@)
-	$(hide) $(ACP) $< $@
+$(static_doc_index_redirect): $(LOCAL_PATH)/docs/docs-preview-index.html
+	$(copy-file-to-target)
 
 $(full_target): $(static_doc_index_redirect)
 $(full_target): $(framework_built)