StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Support to run DroidDoc in unbundled builds."

Browse Source
This commit is contained in:
Ying Wang
2012-04-03 09:27:28 -07:00
committed by Android (Google) Code Review
parent bcfa78b60a 3f45b3c35c
commit 8c8a60e98a
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/Makefile
View File

@@ -38,11 +38,13 @@ unique_product_copy_files_destinations :=
# ----------------------------------------------------------------- # -----------------------------------------------------------------
# docs/index.html # docs/index.html
ifeq (,$(TARGET_BUILD_APPS))
gen := $(OUT_DOCS)/index.html gen := $(OUT_DOCS)/index.html
ALL_DOCS += $(gen) ALL_DOCS += $(gen)
$(gen): frameworks/base/docs/docs-redirect-index.html $(gen): frameworks/base/docs/docs-redirect-index.html
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
@cp -f $< $@ @cp -f $< $@
endif
# ----------------------------------------------------------------- # -----------------------------------------------------------------
# default.prop # default.prop

14
core/droiddoc.mk
View File

@@ -63,9 +63,17 @@ endif
ifneq ($(LOCAL_IS_HOST_MODULE),true) ifneq ($(LOCAL_IS_HOST_MODULE),true)
ifeq ($(LOCAL_JAVA_LIBRARIES),) ifneq ($(LOCAL_SDK_VERSION),)
LOCAL_JAVA_LIBRARIES := core ext framework ifeq ($(LOCAL_SDK_VERSION),current)
endif LOCAL_JAVA_LIBRARIES := android_stubs_current $(LOCAL_JAVA_LIBRARIES)
else
LOCAL_JAVA_LIBRARIES := sdk_v$(LOCAL_SDK_VERSION) $(LOCAL_JAVA_LIBRARIES)
endif
else
LOCAL_JAVA_LIBRARIES := core ext framework $(LOCAL_JAVA_LIBRARIES)
endif # LOCAL_SDK_VERSION
LOCAL_JAVA_LIBRARIES := $(sort $(LOCAL_JAVA_LIBRARIES))
full_java_libs := $(call java-lib-files,$(LOCAL_JAVA_LIBRARIES),$(LOCAL_IS_HOST_MODULE)) full_java_libs := $(call java-lib-files,$(LOCAL_JAVA_LIBRARIES),$(LOCAL_IS_HOST_MODULE))
full_java_lib_deps := $(call java-lib-deps,$(LOCAL_JAVA_LIBRARIES),$(LOCAL_IS_HOST_MODULE)) full_java_lib_deps := $(call java-lib-deps,$(LOCAL_JAVA_LIBRARIES),$(LOCAL_IS_HOST_MODULE))

2
core/java.mk
View File

@@ -21,7 +21,7 @@ ifneq ($(LOCAL_SDK_VERSION),)
Choices are: $(TARGET_AVAILABLE_SDK_VERSIONS)) Choices are: $(TARGET_AVAILABLE_SDK_VERSIONS))
else else
ifeq ($(LOCAL_SDK_VERSION),current) ifeq ($(LOCAL_SDK_VERSION),current)
LOCAL_JAVA_LIBRARIES := android_stubs_$(LOCAL_SDK_VERSION) $(LOCAL_JAVA_LIBRARIES) LOCAL_JAVA_LIBRARIES := android_stubs_current $(LOCAL_JAVA_LIBRARIES)
else else
LOCAL_JAVA_LIBRARIES := sdk_v$(LOCAL_SDK_VERSION) $(LOCAL_JAVA_LIBRARIES) LOCAL_JAVA_LIBRARIES := sdk_v$(LOCAL_SDK_VERSION) $(LOCAL_JAVA_LIBRARIES)
endif endif