Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Put libcore generated source files into LOCAL_INTERMEDIATES_SOURCES

Browse Source 
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
This commit is contained in:
Colin Cross
2017-10-27 10:46:53 -07:00
parent 536d241fb2
commit 72d359f227
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Android.mk
View File

@@ -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