diff options
| author | Ying Wang <wangying@google.com> | 2014-04-07 22:48:37 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-07 22:48:37 +0000 |
| commit | 25c0096bd3ce0f34de5907dc4ef64f48c944c50e (patch) | |
| tree | 3cde81e0b3d4fb265980fd57e1fd3d206594e2b0 /core/droiddoc.mk | |
| parent | be835b6f3eae780557369ac9cf2fdfacec6a2874 (diff) | |
| parent | b55bb77ef260f97337be7f15dc9c1433f2ddce98 (diff) | |
| download | build-25c0096bd3ce0f34de5907dc4ef64f48c944c50e.zip build-25c0096bd3ce0f34de5907dc4ef64f48c944c50e.tar.gz build-25c0096bd3ce0f34de5907dc4ef64f48c944c50e.tar.bz2 | |
am b55bb77e: am 1b08226a: Merge "Different bootclasspath for droiddoc."
* commit 'b55bb77ef260f97337be7f15dc9c1433f2ddce98':
Different bootclasspath for droiddoc.
Diffstat (limited to 'core/droiddoc.mk')
| -rw-r--r-- | core/droiddoc.mk | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/core/droiddoc.mk b/core/droiddoc.mk index d8e9251..1801f75 100644 --- a/core/droiddoc.mk +++ b/core/droiddoc.mk @@ -51,20 +51,22 @@ ifeq ($(LOCAL_DROIDDOC_CUSTOM_ASSET_DIR),) LOCAL_DROIDDOC_CUSTOM_ASSET_DIR := assets endif - -$(full_target): PRIVATE_BOOTCLASSPATH := $(call java-lib-files, core) - -ifneq ($(LOCAL_IS_HOST_MODULE),true) +ifeq ($(LOCAL_IS_HOST_MODULE),true) +$(full_target): PRIVATE_BOOTCLASSPATH := +else ifneq ($(LOCAL_SDK_VERSION),) ifeq ($(LOCAL_SDK_VERSION)$(TARGET_BUILD_APPS),current) # Use android_stubs_current if LOCAL_SDK_VERSION is current and no TARGET_BUILD_APPS. LOCAL_JAVA_LIBRARIES := android_stubs_current $(LOCAL_JAVA_LIBRARIES) + $(full_target): PRIVATE_BOOTCLASSPATH := $(call java-lib-files, android_stubs_current) else LOCAL_JAVA_LIBRARIES := sdk_v$(LOCAL_SDK_VERSION) $(LOCAL_JAVA_LIBRARIES) + $(full_target): PRIVATE_BOOTCLASSPATH := $(call java-lib-files, sdk_v$(LOCAL_SDK_VERSION)) endif else LOCAL_JAVA_LIBRARIES := core ext framework framework2 $(LOCAL_JAVA_LIBRARIES) + $(full_target): PRIVATE_BOOTCLASSPATH := $(call java-lib-files, core) endif # LOCAL_SDK_VERSION LOCAL_JAVA_LIBRARIES := $(sort $(LOCAL_JAVA_LIBRARIES)) |