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

Commit bc697b6a authored by Jiyong Park's avatar Jiyong Park
Browse files

Fix link-type check warning on com.android.media.remotedisplay 

The library has been built without SDK, and is used by an app
RemoteDisplayProviderTest that is built with SDK. Such this SDK ->
non-SDK dependency has been causing link-type check warnings, which will
turn into errors soon.

This change fixes the warning by making a stub library
com.android.media.remotedisplay.stubs from the runtime library and let the app
to link against the stub library. Since the stubs library does not use any
private APIs, it is built with SDK.

Bug: 69899800
Test: m -j RemoteDisplayProviderTest is successful and does not show any
link-type check warning.

Change-Id: I7ee297a9d1aa4f01136b9a026a4939df2d483b8c
parent 2016c0f4

media/lib/remotedisplay/Android.mk

+21 −0
Original line number Diff line number Diff line
@@ -42,3 +42,24 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/permissions 
LOCAL_SRC_FILES := $(LOCAL_MODULE)



include $(BUILD_PREBUILT)



include $(CLEAR_VARS)

LOCAL_MODULE := com.android.media.remotedisplay.stubs-gen

LOCAL_MODULE_CLASS := JAVA_LIBRARIES

LOCAL_SRC_FILES := $(call all-java-files-under,java)

LOCAL_DROIDDOC_STUB_OUT_DIR := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/com.android.media.remotedisplay.stubs_intermediates/src

LOCAL_DROIDDOC_OPTIONS:= \

    -hide 111 -hide 113 -hide 125 -hide 126 -hide 127 -hide 128 \

    -stubpackages com.android.media.remotedisplay \

    -nodocs

LOCAL_UNINSTALLABLE_MODULE := true

include $(BUILD_DROIDDOC)

com_android_media_remotedisplay_gen_stamp := $(full_target)



include $(CLEAR_VARS)

LOCAL_MODULE := com.android.media.remotedisplay.stubs

LOCAL_SDK_VERSION := current

LOCAL_SOURCE_FILES_ALL_GENERATED := true

LOCAL_ADDITIONAL_DEPENDENCIES := $(com_android_media_remotedisplay_gen_stamp)

com_android_media_remotedisplay_gen_stamp :=

include $(BUILD_STATIC_JAVA_LIBRARY)

media/lib/remotedisplay/README.txt

+11 −2
Original line number Diff line number Diff line 
This library (com.android.media.remotedisplay.jar) is a shared java library

There are two libraries defined in this directory:

First, com.android.media.remotedisplay.jar is a shared java library

containing classes required by unbundled remote display providers.

Second, com.android.media.remotedisplay.stubs.jar is a stub for the shared

library which provides build-time APIs to the unbundled clients.



At runtime, the shared library is added to the classloader of the app via the

<uses-library> tag. And since Java always tries to load a class from the

parent classloader, regardless of whether the stub library is linked to the

app statically or dynamically, the real classes are loaded from the shared

library.



--- Rules of this library ---

o This library is effectively a PUBLIC API for unbundled remote display providers

o The stub library is effectively a PUBLIC API for unbundled remote display providers

  that may be distributed outside the system image. So it MUST BE API STABLE.

  You can add but not remove. The rules are the same as for the

  public platform SDK API.

tests/RemoteDisplayProvider/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -21,6 +21,6 @@ LOCAL_MODULE_TAGS := tests 
LOCAL_SDK_VERSION := current

LOCAL_SRC_FILES := $(call all-java-files-under, src)

LOCAL_RESOURCE_DIR = $(LOCAL_PATH)/res

LOCAL_JAVA_LIBRARIES := com.android.media.remotedisplay

LOCAL_JAVA_LIBRARIES := com.android.media.remotedisplay.stubs

LOCAL_CERTIFICATE := platform

include $(BUILD_PACKAGE)