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

Commit 72d359f2 authored by Colin Cross's avatar Colin Cross
Browse files

Put libcore generated source files into LOCAL_INTERMEDIATES_SOURCES 

LOCAL_SRC_FILES is expected to be a list of files relative to the
Android.mk files.  If OUT_DIR is absolute then adding generated
files to the list produces bad paths when $(LOCAL_PATH)/ is prepended
to it.  Put libcore's generated sources into
LOCAL_INTERMEDIATE_SOURCES instead.

Bug: 64930165
Bug: 68375156
Test: m checkbuild
Change-Id: I4b36fd192570ea0cd52d8537a16c078c726d97fd
parent 536d241f

Android.mk

+3 −2
Original line number Diff line number Diff line
@@ -942,7 +942,8 @@ framework_docs_LOCAL_DROIDDOC_SOURCE_PATH := \ 
framework_docs_LOCAL_INTERMEDIATE_SOURCES := \

	$(framework_res_source_path)/android/R.java \

	$(framework_res_source_path)/android/Manifest.java \

	$(framework_res_source_path)/com/android/internal/R.java

	$(framework_res_source_path)/com/android/internal/R.java \

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



framework_docs_LOCAL_API_CHECK_JAVA_LIBRARIES := \

	core-oj \
@@ -1014,7 +1015,7 @@ framework_docs_LOCAL_ADDITIONAL_JAVA_DIR:= \ 


framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES := \

    frameworks/base/docs/knowntags.txt \

    libcore/Docs.mk

    $(libcore_to_document_generated)



samples_dir := development/samples/browseable