commit 046702a6efb6e9dcdee944ed627a298e35cbbd6d
author Jaewoong Jung <jungjw@google.com> Wed Aug 26 15:27:26 2020 -0700
committer Jaewoong Jung <jungjw@google.com> Thu Aug 27 13:10:40 2020 -0700
tree 215b99a6ab9d57ce43bad2b17606fd8a0fde4361
parent ff2c7454fecbda4e651bf7c3b51555571eb9db49

Deduplicate my_compat_dist entries globally.

Fixes: 164319611
Test: m TARGET_PRODUCT=aosp_x86_64 mts dist
Change-Id: Ie47e355ded0ce0221988a405fc77546a4a752c38

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index bf07b49..ebee25a 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -1406,6 +1406,10 @@
 test_files :=
 endif
 
+# Dedpulicate compatibility suite dist files across modules and packages before
+# copying them to their requested locations. Assign the eval result to an unused
+# var to prevent Make from trying to make a sense of it.
+_unused := $(call copy-many-files, $(sort $(ALL_COMPATIBILITY_DIST_FILES)))
 
 # Don't include any GNU General Public License shared objects or static
 # libraries in SDK images.  GPL executables (not static/dynamic libraries)