Add support for specifying LOCAL_SDK_LIBRARIES for prebuilts.
This new variable allows specifying libraries like this:
LOCAL_SDK_VERISON := 25
LOCAL_SDK_LIBRARIES := org.apache.http.legacy,
which would automatically pick up the prebuilt OAHL prebuilt
from prebuilts/sdk/25/public/org.apache.http.legacy.jar
Test: In master with uiautomator.
Bug: 77575476
Change-Id: Id8d92176f5b608c2bcea622b6aed4aa27c32e000
diff --git a/core/config.mk b/core/config.mk
index c432c37..2a1a7d0 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -963,10 +963,11 @@
# 23 -> sdk_public_23_android
# system_current -> sdk_system_current_android
# $(1): An sdk version (LOCAL_SDK_VERSION)
+# $(2): optional library name (default: android)
define resolve-prebuilt-sdk-module
$(if $(findstring _,$(1)),\
- sdk_$(1)_android,\
- sdk_public_$(1)_android)
+ sdk_$(1)_$(or $(2),android),\
+ sdk_public_$(1)_$(or $(2),android))
endef
# Resolve LOCAL_SDK_VERSION to prebuilt framework.aidl