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

Commit 8f40e587 authored by Ying Wang's avatar Ying Wang Committed by Android (Google) Code Review
Browse files

Merge "Fix intermediate src dir for framework.jar"

parents dfe1645c 65ee22aa

Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -363,7 +363,7 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS := \ 
		-werror -hide 113 \

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



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

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



framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES := \

    frameworks/base/docs/knowntags.txt
@@ -586,7 +586,7 @@ LOCAL_JAVA_LIBRARIES:=$(framework_docs_LOCAL_JAVA_LIBRARIES) framework 
LOCAL_MODULE_CLASS:=$(framework_docs_LOCAL_MODULE_CLASS)

LOCAL_DROIDDOC_SOURCE_PATH:=$(framework_docs_LOCAL_DROIDDOC_SOURCE_PATH)

LOCAL_DROIDDOC_HTML_DIR:=$(framework_docs_LOCAL_DROIDDOC_HTML_DIR)

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

LOCAL_ADDITIONAL_JAVA_DIR:=$(framework_docs_LOCAL_ADDITIONAL_JAVA_DIR)

LOCAL_ADDITIONAL_DEPENDENCIES:=$(framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES)



LOCAL_MODULE := hidden

core/java/android/app/IThumbnailRetriever.aidl

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ import android.graphics.Bitmap; 


/**

 * System private API for retrieving thumbnails

 * {@hide}

 */

interface IThumbnailRetriever {

    Bitmap getThumbnail(int index);

core/java/android/content/IOnPrimaryClipChangedListener.aidl

+3 −0
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ 


package android.content;



/**

 * {@hide}

 */

oneway interface IOnPrimaryClipChangedListener {

    void dispatchPrimaryClipChanged();

}