commit 756fddf396712b2e583b345a348d3911860d7151
author Anton Hansson <hansson@google.com> Fri Apr 27 14:07:21 2018 +0100
committer Anton Hansson <hansson@google.com> Fri Apr 27 16:37:20 2018 +0100
tree c1c196f7939047a92bf25b5d653d078f81927683
parent 89b06a15b530acf78727700075d8b457e1cc4eb0

Update art references to prebuilts.

These stubs have been copied to a new location (see ref'd bug). Make
art use the new ones, so that the old ones can be deleted

Bug: 77525052
Test: m out/target/common/obj/PACKAGING/core_dex_intermediates/classes.dex
Test: m out/target/common/obj/PACKAGING/oahl_dex_intermediates/classes.dex
Change-Id: Iba754278415be8c8db3350223ef45e448edd0f8e

tools/veridex/Android.mk

diff --git a/tools/veridex/Android.mk b/tools/veridex/Android.mk
index 4183054..51d924a 100644
--- a/tools/veridex/Android.mk
+++ b/tools/veridex/Android.mk
@@ -18,13 +18,13 @@
 
 system_stub_dex := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/core_dex_intermediates/classes.dex
 $(system_stub_dex): PRIVATE_MIN_SDK_VERSION := 1000
-$(system_stub_dex): $(TOPDIR)prebuilts/sdk/system_current/android.jar | $(ZIP2ZIP) $(DX)
+$(system_stub_dex): $(call resolve-prebuilt-sdk-jar-path,system_current) | $(ZIP2ZIP) $(DX)
 	$(transform-classes-d8.jar-to-dex)
 
 
 oahl_stub_dex := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/oahl_dex_intermediates/classes.dex
 $(oahl_stub_dex): PRIVATE_MIN_SDK_VERSION := 1000
-$(oahl_stub_dex): $(TOPDIR)prebuilts/sdk/org.apache.http.legacy/org.apache.http.legacy.jar | $(ZIP2ZIP) $(DX)
+$(oahl_stub_dex): $(call get-prebuilt-sdk-dir,current)/org.apache.http.legacy.jar | $(ZIP2ZIP) $(DX)
 	$(transform-classes-d8.jar-to-dex)
 
 .PHONY: appcompat