Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f919ef8 authored by Colin Cross's avatar Colin Cross Committed by Android (Google) Code Review
Browse files

Merge "Fix droiddoc when OUT_DIR is an absolute path"

parents 36f46a87 bd200ce7

Android.mk

+22 −22
Original line number Diff line number Diff line
@@ -296,10 +296,9 @@ files_to_check_apis += \ 
      $(SOONG_FRAMEWORK_SRCS)))



# Find all generated files that were used to compile framework.jar

files_to_check_apis += \

  $(addprefix ../../,\

files_to_check_apis_generated := \

  $(filter $(OUT_DIR)/%,\

      $(SOONG_FRAMEWORK_SRCS)))

    $(SOONG_FRAMEWORK_SRCS))



# These are relative to frameworks/base

# FRAMEWORKS_BASE_SUBDIRS comes from build/core/pathmap.mk
@@ -340,8 +339,9 @@ framework_docs_LOCAL_DROIDDOC_SOURCE_PATH := \ 


framework_docs_LOCAL_SRCJARS := $(SOONG_FRAMEWORK_SRCJARS)



framework_docs_LOCAL_INTERMEDIATE_SOURCES := \

	$(patsubst $(TARGET_OUT_COMMON_INTERMEDIATES)/%,%,$(libcore_to_document_generated))

framework_docs_LOCAL_GENERATED_SOURCES := \

  $(libcore_to_document_generated) \

  $(files_to_check_apis_generated) \



framework_docs_LOCAL_API_CHECK_JAVA_LIBRARIES := \

	core-oj \
@@ -462,7 +462,7 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS += \ 
include $(CLEAR_VARS)



LOCAL_SRC_FILES := $(framework_docs_LOCAL_API_CHECK_SRC_FILES)

LOCAL_INTERMEDIATE_SOURCES := $(framework_docs_LOCAL_INTERMEDIATE_SOURCES)

LOCAL_GENERATED_SOURCES := $(framework_docs_LOCAL_GENERATED_SOURCES)

LOCAL_SRCJARS:=$(framework_docs_LOCAL_SRCJARS)

LOCAL_JAVA_LIBRARIES := $(framework_docs_LOCAL_API_CHECK_JAVA_LIBRARIES)

LOCAL_MODULE_CLASS := $(framework_docs_LOCAL_MODULE_CLASS)
@@ -488,7 +488,7 @@ include $(BUILD_APIDIFF) 
include $(CLEAR_VARS)



LOCAL_SRC_FILES := $(framework_docs_LOCAL_API_CHECK_SRC_FILES)

LOCAL_INTERMEDIATE_SOURCES := $(framework_docs_LOCAL_INTERMEDIATE_SOURCES)

LOCAL_GENERATED_SOURCES := $(framework_docs_LOCAL_GENERATED_SOURCES)

LOCAL_SRCJARS:=$(framework_docs_LOCAL_SRCJARS)

LOCAL_JAVA_LIBRARIES := $(framework_docs_LOCAL_API_CHECK_JAVA_LIBRARIES)

LOCAL_MODULE_CLASS := $(framework_docs_LOCAL_MODULE_CLASS)
@@ -514,7 +514,7 @@ include $(BUILD_APIDIFF) 
include $(CLEAR_VARS)



LOCAL_SRC_FILES:=$(framework_docs_LOCAL_API_CHECK_SRC_FILES)

LOCAL_INTERMEDIATE_SOURCES:=$(framework_docs_LOCAL_INTERMEDIATE_SOURCES)

LOCAL_GENERATED_SOURCES:=$(framework_docs_LOCAL_GENERATED_SOURCES)

LOCAL_SRCJARS:=$(framework_docs_LOCAL_SRCJARS)

LOCAL_JAVA_LIBRARIES:=$(framework_docs_LOCAL_API_CHECK_JAVA_LIBRARIES)

LOCAL_MODULE_CLASS:=$(framework_docs_LOCAL_MODULE_CLASS)
@@ -549,7 +549,7 @@ $(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_API_FILE)) 
include $(CLEAR_VARS)



LOCAL_SRC_FILES:=$(framework_docs_LOCAL_API_CHECK_SRC_FILES)

LOCAL_INTERMEDIATE_SOURCES:=$(framework_docs_LOCAL_INTERMEDIATE_SOURCES)

LOCAL_GENERATED_SOURCES:=$(framework_docs_LOCAL_GENERATED_SOURCES)

LOCAL_SRCJARS:=$(framework_docs_LOCAL_SRCJARS)

LOCAL_JAVA_LIBRARIES:=$(framework_docs_LOCAL_API_CHECK_JAVA_LIBRARIES)

LOCAL_MODULE_CLASS:=$(framework_docs_LOCAL_MODULE_CLASS)
@@ -586,7 +586,7 @@ $(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_SYSTEM_API_FILE)) 
include $(CLEAR_VARS)



LOCAL_SRC_FILES:=$(framework_docs_LOCAL_API_CHECK_SRC_FILES)

LOCAL_INTERMEDIATE_SOURCES:=$(framework_docs_LOCAL_INTERMEDIATE_SOURCES)

LOCAL_GENERATED_SOURCES:=$(framework_docs_LOCAL_GENERATED_SOURCES)

LOCAL_SRCJARS:=$(framework_docs_LOCAL_SRCJARS)

LOCAL_JAVA_LIBRARIES:=$(framework_docs_LOCAL_API_CHECK_JAVA_LIBRARIES)

LOCAL_MODULE_CLASS:=$(framework_docs_LOCAL_MODULE_CLASS)
@@ -624,7 +624,7 @@ $(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_TEST_API_FILE)) 
include $(CLEAR_VARS)



LOCAL_SRC_FILES:=$(framework_docs_LOCAL_SRC_FILES)

LOCAL_INTERMEDIATE_SOURCES:=$(framework_docs_LOCAL_INTERMEDIATE_SOURCES)

LOCAL_GENERATED_SOURCES:=$(framework_docs_LOCAL_GENERATED_SOURCES)

LOCAL_SRCJARS:=$(framework_docs_LOCAL_SRCJARS)

LOCAL_JAVA_LIBRARIES:=$(framework_docs_LOCAL_JAVA_LIBRARIES)

LOCAL_MODULE_CLASS:=$(framework_docs_LOCAL_MODULE_CLASS)
@@ -658,7 +658,7 @@ update-api: doc-comment-check-docs 
include $(CLEAR_VARS)



LOCAL_SRC_FILES:=$(framework_docs_LOCAL_SRC_FILES)

LOCAL_INTERMEDIATE_SOURCES:=$(framework_docs_LOCAL_INTERMEDIATE_SOURCES)

LOCAL_GENERATED_SOURCES:=$(framework_docs_LOCAL_GENERATED_SOURCES)

LOCAL_SRCJARS:=$(framework_docs_LOCAL_SRCJARS)

LOCAL_JAVA_LIBRARIES:=$(framework_docs_LOCAL_JAVA_LIBRARIES)

LOCAL_MODULE_CLASS:=$(framework_docs_LOCAL_MODULE_CLASS)
@@ -694,7 +694,7 @@ $(full_target): $(static_doc_index_redirect) 
include $(CLEAR_VARS)



LOCAL_SRC_FILES:=$(framework_docs_LOCAL_SRC_FILES)

LOCAL_INTERMEDIATE_SOURCES:=$(framework_docs_LOCAL_INTERMEDIATE_SOURCES)

LOCAL_GENERATED_SOURCES:=$(framework_docs_LOCAL_GENERATED_SOURCES)

LOCAL_SRCJARS:=$(framework_docs_LOCAL_SRCJARS)

LOCAL_JAVA_LIBRARIES:=$(framework_docs_LOCAL_JAVA_LIBRARIES)

LOCAL_MODULE_CLASS:=$(framework_docs_LOCAL_MODULE_CLASS)
@@ -736,7 +736,7 @@ $(full_target): $(static_doc_properties) 
include $(CLEAR_VARS)



LOCAL_SRC_FILES:=$(framework_docs_LOCAL_SRC_FILES)

LOCAL_INTERMEDIATE_SOURCES:=$(framework_docs_LOCAL_INTERMEDIATE_SOURCES)

LOCAL_GENERATED_SOURCES:=$(framework_docs_LOCAL_GENERATED_SOURCES)

LOCAL_SRCJARS:=$(framework_docs_LOCAL_SRCJARS)

LOCAL_JAVA_LIBRARIES:=$(framework_docs_LOCAL_JAVA_LIBRARIES)

LOCAL_MODULE_CLASS:=$(framework_docs_LOCAL_MODULE_CLASS)
@@ -781,7 +781,7 @@ $(full_target): $(framework_built) 
include $(CLEAR_VARS)



LOCAL_SRC_FILES:=$(framework_docs_LOCAL_SRC_FILES)

LOCAL_INTERMEDIATE_SOURCES:=$(framework_docs_LOCAL_INTERMEDIATE_SOURCES)

LOCAL_GENERATED_SOURCES:=$(framework_docs_LOCAL_GENERATED_SOURCES)

LOCAL_SRCJARS:=$(framework_docs_LOCAL_SRCJARS)

LOCAL_STATIC_JAVA_LIBRARIES:=$(framework_docs_LOCAL_STATIC_JAVA_LIBRARIES)

LOCAL_JAVA_LIBRARIES:=$(framework_docs_LOCAL_JAVA_LIBRARIES)
@@ -810,7 +810,7 @@ include $(BUILD_DROIDDOC) 
include $(CLEAR_VARS)



LOCAL_SRC_FILES:=$(framework_docs_LOCAL_SRC_FILES)

LOCAL_INTERMEDIATE_SOURCES:=$(framework_docs_LOCAL_INTERMEDIATE_SOURCES)

LOCAL_GENERATED_SOURCES:=$(framework_docs_LOCAL_GENERATED_SOURCES)

LOCAL_SRCJARS:=$(framework_docs_LOCAL_SRCJARS)

LOCAL_STATIC_JAVA_LIBRARIES:=$(framework_docs_LOCAL_STATIC_JAVA_LIBRARIES)

LOCAL_JAVA_LIBRARIES:=$(framework_docs_LOCAL_JAVA_LIBRARIES)
@@ -846,7 +846,7 @@ include $(BUILD_DROIDDOC) 
# ==== docs for the web (on the devsite app engine server) =======================

include $(CLEAR_VARS)

LOCAL_SRC_FILES:=$(framework_docs_LOCAL_SRC_FILES)

LOCAL_INTERMEDIATE_SOURCES:=$(framework_docs_LOCAL_INTERMEDIATE_SOURCES)

LOCAL_GENERATED_SOURCES:=$(framework_docs_LOCAL_GENERATED_SOURCES)

LOCAL_SRCJARS:=$(framework_docs_LOCAL_SRCJARS)

LOCAL_STATIC_JAVA_LIBRARIES:=$(framework_docs_LOCAL_STATIC_JAVA_LIBRARIES)

LOCAL_JAVA_LIBRARIES:=$(framework_docs_LOCAL_JAVA_LIBRARIES)
@@ -876,7 +876,7 @@ include $(BUILD_DROIDDOC) 
# ==== docs for the web (on the devsite app engine server) =======================

include $(CLEAR_VARS)

LOCAL_SRC_FILES:=$(framework_docs_LOCAL_SRC_FILES)

LOCAL_INTERMEDIATE_SOURCES:=$(framework_docs_LOCAL_INTERMEDIATE_SOURCES)

LOCAL_GENERATED_SOURCES:=$(framework_docs_LOCAL_GENERATED_SOURCES)

LOCAL_SRCJARS:=$(framework_docs_LOCAL_SRCJARS)

LOCAL_STATIC_JAVA_LIBRARIES:=$(framework_docs_LOCAL_STATIC_JAVA_LIBRARIES)

LOCAL_JAVA_LIBRARIES:=$(framework_docs_LOCAL_JAVA_LIBRARIES)
@@ -906,7 +906,7 @@ include $(BUILD_DROIDDOC) 
include $(CLEAR_VARS)



LOCAL_SRC_FILES:=$(framework_docs_LOCAL_SRC_FILES)

LOCAL_INTERMEDIATE_SOURCES:=$(framework_docs_LOCAL_INTERMEDIATE_SOURCES)

LOCAL_GENERATED_SOURCES:=$(framework_docs_LOCAL_GENERATED_SOURCES)

LOCAL_SRCJARS:=$(framework_docs_LOCAL_SRCJARS)

LOCAL_STATIC_JAVA_LIBRARIES:=$(framework_docs_LOCAL_STATIC_JAVA_LIBRARIES)

LOCAL_JAVA_LIBRARIES:=$(framework_docs_LOCAL_JAVA_LIBRARIES)
@@ -932,7 +932,7 @@ include $(BUILD_DROIDDOC) 
include $(CLEAR_VARS)



LOCAL_SRC_FILES:=$(framework_docs_LOCAL_SRC_FILES)

LOCAL_INTERMEDIATE_SOURCES:=$(framework_docs_LOCAL_INTERMEDIATE_SOURCES)

LOCAL_GENERATED_SOURCES:=$(framework_docs_LOCAL_GENERATED_SOURCES)

LOCAL_SRCJARS:=$(framework_docs_LOCAL_SRCJARS)

LOCAL_STATIC_JAVA_LIBRARIES:=$(framework_docs_LOCAL_STATIC_JAVA_LIBRARIES)

LOCAL_JAVA_LIBRARIES:=$(framework_docs_LOCAL_JAVA_LIBRARIES)
@@ -961,7 +961,7 @@ include $(BUILD_DROIDDOC) 
include $(CLEAR_VARS)



LOCAL_SRC_FILES:=$(framework_docs_LOCAL_SRC_FILES)

LOCAL_INTERMEDIATE_SOURCES:=$(framework_docs_LOCAL_INTERMEDIATE_SOURCES)

LOCAL_GENERATED_SOURCES:=$(framework_docs_LOCAL_GENERATED_SOURCES)

LOCAL_SRCJARS:=$(framework_docs_LOCAL_SRCJARS)

LOCAL_JAVA_LIBRARIES:=$(framework_docs_LOCAL_JAVA_LIBRARIES)

LOCAL_MODULE_CLASS:=$(framework_docs_LOCAL_MODULE_CLASS)