commit 1207c86cd6bed41385e82da56eefac4093898c3f
author Andreas Gampe <agampe@google.com> Thu Aug 31 19:24:32 2017 -0700
committer Andreas Gampe <agampe@google.com> Sat Sep 02 15:22:43 2017 -0700
tree 43142801585198fea5d9b926aac3c5914dba08b5
parent 2fc0f4e4844c6ccdb9ce7bd3a5ce992de904daea

Build: Move preopt classpath to private variable

Move DEX2OAT_CLASS_LOADER_CONTEXT to
PRIVATE_DEX2OAT_CLASS_LOADER_CONTEXT in preparation for actual
classpaths.

Bug: 65256727
Test: m
Test: oatdump --oat-file=$OUT/system/framework/oat/arm64/wifi-service.odex --header-only
Change-Id: I5bcfebcd3be1a187954f550dbe1d3aa1d5099052

core/setup_one_odex.mk

diff --git a/core/setup_one_odex.mk b/core/setup_one_odex.mk
index f0ffe81..e0d9926 100644
--- a/core/setup_one_odex.mk
+++ b/core/setup_one_odex.mk
@@ -32,6 +32,10 @@
     $(DEXPREOPT_ONE_FILE_DEPENDENCY_TOOLS) \
     $(my_dex_preopt_image_filename)
 
+# Pass special class loader context to skip the classpath and collision check.
+# Should modify build system to pass used libraries properly later.
+$(my_built_odex): PRIVATE_DEX2OAT_CLASS_LOADER_CONTEXT := \&
+
 my_installed_odex := $(call get-odex-installed-file-path,$($(my_2nd_arch_prefix)DEX2OAT_TARGET_ARCH),$(LOCAL_INSTALLED_MODULE))
 
 my_built_vdex := $(patsubst %.odex,%.vdex,$(my_built_odex))