commit 29664e1cdbe58a97c692a7f2ac5c6a152c2c967c
author Alex Klyubin <klyubin@google.com> Thu Feb 18 02:03:32 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 18 02:03:32 2016 +0000
tree 92ad8dc6f8a4cc1ae1bef15d89029035bf98cd2f
parent 150fd17a408c9e609bbc7a938542edf7c94aa872
parent 8d8c3de3b126d7004a6dc260debf43b5a40e5e60

Merge "Switch to production constant for v2 signing scheme ID." into nyc-dev

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))