diff options
| author | 2017-10-31 15:55:26 +0000 | |
|---|---|---|
| committer | 2017-10-31 15:55:26 +0000 | |
| commit | b60ce367411bec734e13a91c7140f192d8fade11 (patch) | |
| tree | 9b2124ffa31a848fd74a5456874fdc37a408568b | |
| parent | 378f389b7585c9a71ec7096613d5b54b0cd815da (diff) | |
| parent | e36525fb09d1fb05a93d825ca2522ee60f2948b2 (diff) | |
Merge "Merge "Put libcore generated source files into LOCAL_INTERMEDIATES_SOURCES" am: 834be81189 am: 8476a2c75d am: c77b846688"
| -rw-r--r-- | Android.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk index 62f750c41a8b..9843f175bf2d 100644 --- a/Android.mk +++ b/Android.mk @@ -989,7 +989,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 \ @@ -1060,7 +1061,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 |