diff options
| author | Ying Wang <wangying@google.com> | 2013-02-22 14:32:30 -0800 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2013-02-22 14:32:30 -0800 |
| commit | 9485a57bb2e55535fc337f2be803e79cd1c46b62 (patch) | |
| tree | dc74ef1b3b5d08e968d82a9e2077661e41d2840e /core/definitions.mk | |
| parent | e822c1e3e1c9933bd951444a6e970d9caa584271 (diff) | |
| download | build-9485a57bb2e55535fc337f2be803e79cd1c46b62.zip build-9485a57bb2e55535fc337f2be803e79cd1c46b62.tar.gz build-9485a57bb2e55535fc337f2be803e79cd1c46b62.tar.bz2 | |
Untwist the target/host shared library dependencies.
Before this, if there are duplicate module names in both the host and
target spaces, LOCAL_SHARED_LIBRARIES results in mixed dependencies.
Bug: 7026946
Change-Id: I5407e3d078a8903c94978cc6d3e256851c52340f
Diffstat (limited to 'core/definitions.mk')
| -rw-r--r-- | core/definitions.mk | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/core/definitions.mk b/core/definitions.mk index cb20d8f..69e7baa 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -81,6 +81,11 @@ ALL_FINDBUGS_FILES:= # GPL module license files ALL_GPL_MODULE_LICENSE_FILES:= +# Target and host installed module's dependencies on shared libraries. +# They are list of "<installed_file>:lib1,lib2...". +TARGET_DEPENDENCIES_ON_SHARED_LIBRARIES := +HOST_DEPENDENCIES_ON_SHARED_LIBRARIES := + # Generated class file names for Android resource. # They are escaped and quoted so can be passed safely to a bash command. ANDROID_RESOURCE_GENERATED_CLASSES := 'R.class' 'R$$*.class' 'Manifest.class' 'Manifest$$*.class' |