commit 4d2b9bf341e7978225d6a305c2524ff79f2d18c5
author Xavier Ducrohet <xav@android.com> Wed Sep 21 10:22:19 2011 -0700
committer Xavier Ducrohet <xav@android.com> Wed Sep 21 16:03:19 2011 -0700
tree 5fdf634b197a1f498c1974b3816bcd3c4b7ec222
parent 04c485843f9fce0f66d18cb96e1051b7382b1f38

Cherrypick 6de7bc61 from master. do not merge.

Copy notice file in the new system image folder

Change-Id: I66496f382b2d13b030de569b573630f3abe5b9de

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 93dda66..ebc8a85 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1419,7 +1419,7 @@
 			-v "DLL_EXTENSION=$(HOST_SHLIB_SUFFIX)" \
 			-o $(PRIVATE_DIR) && \
 		cp -f $(target_notice_file_txt) \
-				$(PRIVATE_DIR)/platforms/android-$(PLATFORM_VERSION)/images/$(TARGET_CPU_ABI)/NOTICE.txt && \
+				$(PRIVATE_DIR)/system-images/android-$(PLATFORM_VERSION)/$(TARGET_CPU_ABI)/NOTICE.txt && \
 		cp -f $(tools_notice_file_txt) $(PRIVATE_DIR)/tools/NOTICE.txt && \
 		cp -f $(tools_notice_file_txt) $(PRIVATE_DIR)/platform-tools/NOTICE.txt && \
 		HOST_OUT_EXECUTABLES=$(HOST_OUT_EXECUTABLES) HOST_OS=$(HOST_OS) \