Merge "Replace -classpath with --class-loader-context for preopt" into oc-mr1-dev

DEX2OAT := $(HOST_OUT_EXECUTABLES)/dex2oatd$(HOST_EXECUTABLE_SUFFIX)

endif

# Pass special classpath to skip uses library check.

# Pass special class loader context to skip the classpath and collision check.

# Should modify build system to pass used libraries properly later.

DEX2OAT_CLASSPATH := "&"

DEX2OAT_CLASS_LOADER_CONTEXT := "&"

DEX2OAT_DEPENDENCY += $(DEX2OAT)

$(hide) mkdir -p $(dir $(2))

$(hide) ANDROID_LOG_TAGS="*:e" $(DEX2OAT) \

	--runtime-arg -Xms$(DEX2OAT_XMS) --runtime-arg -Xmx$(DEX2OAT_XMX) \

	--runtime-arg -classpath --runtime-arg $(DEX2OAT_CLASSPATH) \

	--class-loader-context=$(DEX2OAT_CLASS_LOADER_CONTEXT) \

	--boot-image=$(PRIVATE_DEX_PREOPT_IMAGE_LOCATION) \

	--dex-file=$(1) \

	--dex-location=$(PRIVATE_DEX_LOCATION) \