commit bca9632895807777d4b43cfee39412fe69d63717
author Ulya Trafimovich <skvadrik@google.com> Fri May 07 16:13:45 2021 +0100
committer Ulya Trafimovich <skvadrik@google.com> Tue May 11 14:27:46 2021 +0100
tree bff45f45deb9c5e04050599c2d41bfe6a6f7a30c
parent 4b4bf9f7559070e68112ce81ad3f81f2ef1a2c8c

Add <uses-library> information.

LOCAL_USES_LIBRARIES / LOCAL_OPTIONAL_USES_LIBRARIES should be added to
the app's Android.mk module and should match <uses-library> tags in the
app's manifest, so that the build knows about these libraries and
generates correct class loader context for dexpreopt.

Bug: 132357300
Test: m out/target/common/obj/APPS/Development_intermediates/enforce_uses_libraries.status
Change-Id: Ie5e36dd60040a1e7653acdf882e006de513f5367
Merged-In: Ie5e36dd60040a1e7653acdf882e006de513f5367
(cherry picked from commit 247d38afd5193abaa2fd88e5d7839b44c0dc8cb1)

apps/Development/Android.mk

diff --git a/apps/Development/Android.mk b/apps/Development/Android.mk
index 39498d5..3db6cc3 100644
--- a/apps/Development/Android.mk
+++ b/apps/Development/Android.mk
@@ -5,6 +5,9 @@
 
 LOCAL_JAVA_LIBRARIES := android.test.runner.stubs telephony-common org.apache.http.legacy
 
+LOCAL_USES_LIBRARIES := android.test.runner
+LOCAL_OPTIONAL_USES_LIBRARIES := org.apache.http.legacy android.test.base android.test.mock
+
 LOCAL_SRC_FILES := $(call all-subdir-java-files) \
                 src/com/android/development/IRemoteService.aidl \