summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Duffin <paulduffin@google.com>2018-11-23 12:19:49 +0000
committerPaul Duffin <paulduffin@google.com>2018-11-27 12:53:16 +0000
commitba4cee0b1c571f05ea9c5e9a9ffc62e50f6460dd (patch)
tree7f68b708885b7200033a3e5b1094df574438253d
parent2e64868e1d7721deb46c118aacbf024cb0d31a3f (diff)
downloadbase-ba4cee0b1c571f05ea9c5e9a9ffc62e50f6460dd.tar.gz
Make ext build against core.platform.api.stubs
The ext target needs to be switched from core_current to depending on core.platform.api.stubs (the default when no sdk_version is specified and no_frameworks_libs = true) as it statically includes libphonenumber-platform which itself needs to depend on core.platform.api.stubs as it needs access to the dalvik.annotation.compat.UnsupportedAppUsage annotation. Without this change modifying the libphonenumber-platform target to depend on core.platform.api.stubs causes a build failure. Tested by changing libphonenumber-platform target to depend on core.platform.api.stubs and running make checkbuild. Bug: 117818301 Test: see above Change-Id: I2b9154d22b67aafb57493b41b527818c37212c34
-rw-r--r--Android.bp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
index 8b607459a98d..d8bbf4c7c844 100644
--- a/Android.bp
+++ b/Android.bp
@@ -816,7 +816,7 @@ gensrcs {
java_library {
name: "ext",
installable: true,
- sdk_version: "core_current",
+ no_framework_libs: true,
static_libs: [
"libphonenumber-platform",
"nist-sip",