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

Commit e36525fb authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Put libcore generated source files into LOCAL_INTERMEDIATES_SOURCES"... 

Merge "Put libcore generated source files into LOCAL_INTERMEDIATES_SOURCES" am: 834be811 am: 8476a2c7
am: c77b8466

Change-Id: Id27ebbdae64400b3e55915dda1cd9186ddd8f1f6
parents e74399de c77b8466

Android.mk

+3 −2
Original line number Diff line number Diff line
@@ -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