Use sdk as the bootstrap classpath while compiling against sdk.
Change-Id: Iad16b8c03d88d138abee5e24433b6a654fa21410 http://b/issue?id=2623361
This commit is contained in:
parent
027dcb47de
commit
5b59f6b08c
1 changed files with 8 additions and 2 deletions
|
@ -319,8 +319,14 @@ $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JAVA_OBJECTS := $(patsubst %.java,%.class
|
||||||
ifeq ($(my_prefix),TARGET_)
|
ifeq ($(my_prefix),TARGET_)
|
||||||
ifeq ($(LOCAL_SDK_VERSION),)
|
ifeq ($(LOCAL_SDK_VERSION),)
|
||||||
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_BOOTCLASSPATH := -bootclasspath $(call java-lib-files,core)
|
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_BOOTCLASSPATH := -bootclasspath $(call java-lib-files,core)
|
||||||
endif
|
else
|
||||||
endif
|
ifeq ($(LOCAL_SDK_VERSION),current)
|
||||||
|
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_BOOTCLASSPATH := -bootclasspath $(call java-lib-files,android_stubs_current)
|
||||||
|
else
|
||||||
|
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_BOOTCLASSPATH := -bootclasspath $(call java-lib-files,sdk_v$(LOCAL_SDK_VERSION))
|
||||||
|
endif # current
|
||||||
|
endif # LOCAL_SDK_VERSION
|
||||||
|
endif # TARGET_
|
||||||
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_RESOURCE_DIR := $(LOCAL_RESOURCE_DIR)
|
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_RESOURCE_DIR := $(LOCAL_RESOURCE_DIR)
|
||||||
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_EXTRA_JAR_ARGS := $(extra_jar_args)
|
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_EXTRA_JAR_ARGS := $(extra_jar_args)
|
||||||
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_ASSET_DIR := $(LOCAL_ASSET_DIR)
|
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_ASSET_DIR := $(LOCAL_ASSET_DIR)
|
||||||
|
|
Loading…
Reference in a new issue