commit 150fd17a408c9e609bbc7a938542edf7c94aa872
author Ying Wang <wangying@google.com> Tue Feb 16 15:42:26 2016 -0800
committer Ying Wang <wangying@google.com> Wed Feb 17 20:36:15 2016 +0000
tree 24724aa3289e076a54e6bc39681bfcc801640174
parent d2f35846e4ccb422af26e183128030f1f8fc7f80

Use LOCAL_COMPATIBILITY_SUPPORT_FILES relative to $(TOP).

So that you can have LOCAL_COMPATIBILITY_SUPPORT_FILES generated in the
out directory.

Change-Id: I3e011fc3db5de170f7befcb12841d230283671a6
(cherry picked from commit c3e4b2f390301ffd86a8773d6fb5336b71564dad)

core/base_rules.mk

diff --git a/core/base_rules.mk b/core/base_rules.mk
index 666e2ac..e5e42d4 100644
--- a/core/base_rules.mk
+++ b/core/base_rules.mk
@@ -386,8 +386,8 @@
 # LOCAL_COMPATIBILITY_SUPPORT_FILES is a list of <src>[:<dest>].
 my_compat_dist += $(foreach f, $(LOCAL_COMPATIBILITY_SUPPORT_FILES),\
   $(eval p := $(subst :,$(space),$(f)))\
-  $(eval s := $(LOCAL_PATH)/$(word 1,$(p)))\
-  $(eval d := $(COMPATIBILITY_TESTCASES_OUT_$(LOCAL_COMPATIBILITY_SUITE))/$(or $(word 2,$(p)),$(word 1,$(p))))\
+  $(eval s := $(word 1,$(p)))\
+  $(eval d := $(COMPATIBILITY_TESTCASES_OUT_$(LOCAL_COMPATIBILITY_SUITE))/$(or $(word 2,$(p)),$(notdir $(word 1,$(p)))))\
   $(s):$(d))
 
 ifneq (,$(wildcard $(LOCAL_PATH)/AndroidTest.xml))