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

Merge "Put libcore generated source files into LOCAL_INTERMEDIATES_SOURCES" am: 834be81189

Browse Source 
am: 8476a2c75d

Change-Id: I005a2a4b02c2c0665e2f3aa84d59c5202a8991cb
This commit is contained in:
Colin Cross
2017-10-31 15:42:52 +00:00
committed by android-build-merger
parent 60923f7860 8476a2c75d
commit c77b846688
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

@@ -961,7 +961,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 \
@@ -1032,7 +1033,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