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

Commit 03e47fc8 authored by Steve Howard's avatar Steve Howard Committed by Android Git Automerger
Browse files

Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base

parents 0b576506 552faebe

Android.mk

+1 −2
Original line number Diff line number Diff line
@@ -366,8 +366,7 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS := \ 
    -since ./frameworks/base/api/7.xml 7 \

    -since ./frameworks/base/api/8.xml 8 \

    -since ./frameworks/base/api/current.xml HC \

		-error 101 -error 102 -warning 103 -error 104 -error 106 -error 108 -warning 113 \

		-error 114 \

		-werror -hide 113 \

		-overview $(LOCAL_PATH)/core/java/overview.html



framework_docs_LOCAL_ADDITIONAL_JAVA_DIR:= $(call intermediates-dir-for,JAVA_LIBRARIES,framework)