commit 9235faa9a4b07ad144ead1c421f44a6da99d1576
author Anton Hansson <hansson@google.com> Tue Apr 10 16:18:44 2018 +0100
committer Anton Hansson <hansson@google.com> Wed Apr 18 16:15:05 2018 +0100
tree 92c5cc31e2aafa82598e1b524e4bee65843b229a
parent 0c2a796853f97304001aa8d901188745411a960a

Switch make over to use the new prebuilt modules.

There are a couple more places throughout the tree that use the old
modules, and I will update those next before deleting the old module
definitions.

Bug: 77525052
Test: make droid
Change-Id: I9385ae34cc1646cbd4e249d9e96a0116296f139a

core/java.mk

diff --git a/core/java.mk b/core/java.mk
index 0361c83..94b7bcb 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -120,7 +120,7 @@
   # LOCAL_SDK_VERSION is current and no TARGET_BUILD_APPS
   aidl_preprocess_import := $(TARGET_OUT_COMMON_INTERMEDIATES)/framework.aidl
 else
-  aidl_preprocess_import := $(HISTORICAL_SDK_VERSIONS_ROOT)/$(LOCAL_SDK_VERSION)/framework.aidl
+  aidl_preprocess_import := $(call resolve-prebuilt-aidl-path,$(LOCAL_SDK_VERSION))
 endif # not current or system_current
 else
 # build against the platform.