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"

Browse Source 
am: 834be81189

Change-Id: Iec1547cc91bf3cb08a47194e91838eb77b4126d7
This commit is contained in:
Colin Cross
2017-10-31 15:33:53 +00:00
committed by android-build-merger
parent 4f59edb63f 834be81189
commit 8476a2c75d
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_docs_LOCAL_INTERMEDIATE_SOURCES := \
$(framework_res_source_path)/android/R.java \ $(framework_res_source_path)/android/R.java \
$(framework_res_source_path)/android/Manifest.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 := \ framework_docs_LOCAL_API_CHECK_JAVA_LIBRARIES := \
core-oj \ core-oj \
@@ -1014,7 +1015,7 @@ framework_docs_LOCAL_ADDITIONAL_JAVA_DIR:= \
framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES := \ framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES := \
frameworks/base/docs/knowntags.txt \ frameworks/base/docs/knowntags.txt \
libcore/Docs.mk $(libcore_to_document_generated)
samples_dir := development/samples/browseable samples_dir := development/samples/browseable