am 4ff55ba0: am e62902c9: Fix http://b/2114936 - Setting LOCAL_SDK_VERSION current still allows internal API references
Merge commit '4ff55ba0c7749abb0039fa49024be5f1b0e62de2' * commit '4ff55ba0c7749abb0039fa49024be5f1b0e62de2': Fix http://b/2114936 - Setting LOCAL_SDK_VERSION current still allows internal API references
This commit is contained in:
commit
dea0b8c5ea
|
@ -272,8 +272,10 @@ $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_SOURCE_INTERMEDIATES_DIR := $(intermediat
|
|||
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JAVA_SOURCES := $(all_java_sources)
|
||||
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JAVA_OBJECTS := $(patsubst %.java,%.class,$(LOCAL_SRC_FILES))
|
||||
ifeq ($(my_prefix),TARGET_)
|
||||
ifeq ($(LOCAL_SDK_VERSION),)
|
||||
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_BOOTCLASSPATH := -bootclasspath $(call java-lib-files,core)
|
||||
endif
|
||||
endif
|
||||
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_RESOURCE_DIR := $(LOCAL_RESOURCE_DIR)
|
||||
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_EXTRA_JAR_ARGS := $(extra_jar_args)
|
||||
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_ASSET_DIR := $(LOCAL_ASSET_DIR)
|
||||
|
|
Loading…
Reference in New Issue