summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2013-08-23 12:07:45 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-08-23 12:07:45 -0700
commit29695daa9734a8dfb516b7ff2e35b2b263e6b37b (patch)
tree9535eaa797dc309e936ff29cf2e75f2e1a818122 /core
parent2363485c2fb3f08d36e8cdbb2240b9c3993b470c (diff)
parent653a037d70d770d2fc03d4f205a9c626af5f5c76 (diff)
downloadbuild-29695daa9734a8dfb516b7ff2e35b2b263e6b37b.zip
build-29695daa9734a8dfb516b7ff2e35b2b263e6b37b.tar.gz
build-29695daa9734a8dfb516b7ff2e35b2b263e6b37b.tar.bz2
am 653a037d: am 638ce57a: Treat LOCAL_APK_LIBRARIES like shared Java libraries.
* commit '653a037d70d770d2fc03d4f205a9c626af5f5c76': Treat LOCAL_APK_LIBRARIES like shared Java libraries.
Diffstat (limited to 'core')
-rw-r--r--core/base_rules.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/base_rules.mk b/core/base_rules.mk
index 81a344f..80873da 100644
--- a/core/base_rules.mk
+++ b/core/base_rules.mk
@@ -414,6 +414,7 @@ ifdef LOCAL_APK_LIBRARIES
APPS,$(lib),,COMMON)/classes.jar)
# link against the jar with full original names (before proguard processing).
+ full_shared_java_libs += $(link_apk_libraries)
full_java_libs += $(link_apk_libraries)
full_java_lib_deps += $(link_apk_libraries)
endif