diff options
| author | Eric Fischer <> | 2009-03-25 16:12:29 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-03-25 16:12:29 -0700 |
| commit | 7bbec3ab9708d1d1cb578479a582d6f8d12de230 (patch) | |
| tree | 3de9fe49195c3814d95d10c6a5345d0b34d4845d /core/dynamic_binary.mk | |
| parent | 99048a01e66dc236e3b7a7886c6924ec23993c81 (diff) | |
| download | build-7bbec3ab9708d1d1cb578479a582d6f8d12de230.zip build-7bbec3ab9708d1d1cb578479a582d6f8d12de230.tar.gz build-7bbec3ab9708d1d1cb578479a582d6f8d12de230.tar.bz2 | |
Automated import from //branches/master/...@142758,142758
Diffstat (limited to 'core/dynamic_binary.mk')
| -rw-r--r-- | core/dynamic_binary.mk | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/core/dynamic_binary.mk b/core/dynamic_binary.mk index 10027b8..f07cf2a 100644 --- a/core/dynamic_binary.mk +++ b/core/dynamic_binary.mk @@ -18,7 +18,15 @@ ifeq ($(LOCAL_UNSTRIPPED_PATH),) endif # The name of the target file, without any path prepended. -LOCAL_BUILT_MODULE_STEM := $(LOCAL_MODULE)$(LOCAL_MODULE_SUFFIX) +# TODO: This duplicates logic from base_rules.mk because we need to +# know its results before base_rules.mk is included. +# Consolidate the duplicates. +LOCAL_MODULE_STEM := $(strip $(LOCAL_MODULE_STEM)) +ifeq ($(LOCAL_MODULE_STEM),) + LOCAL_MODULE_STEM := $(LOCAL_MODULE) +endif +LOCAL_INSTALLED_MODULE_STEM := $(LOCAL_MODULE_STEM)$(LOCAL_MODULE_SUFFIX) +LOCAL_BUILT_MODULE_STEM := $(LOCAL_INSTALLED_MODULE_STEM) # base_rules.make defines $(intermediates), but we need its value # before we include base_rules. Make a guess, and verify that |