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

Commit 65ee22aa authored by Ying Wang's avatar Ying Wang
Browse files

Fix intermediate src dir for framework.jar 

Intermediate src dir for JAVA_LIBRARIES should be in the common
intermediate dir.

Change-Id: Ib16ddd63aed080cdd1494204b347c1e1e1beafcb
parent fa1e5561

Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -361,7 +361,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
@@ -584,7 +584,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();

}