commit dcc08f073b6873c69ab891d4f69f7c568e282df7
author The Android Open Source Project <initial-contribution@android.com> Wed Dec 17 18:03:49 2008 -0800
committer The Android Open Source Project <initial-contribution@android.com> Wed Dec 17 18:03:49 2008 -0800
tree cbaa218be3f46078555b6bfb36c48659096a747a
parent d3aa4000e42fd1036e0e3286843c5132f905d754

Code drop from //branches/cupcake/...@124589

core/base_rules.mk

diff --git a/core/base_rules.mk b/core/base_rules.mk
index 507108f..2c442f6 100644
--- a/core/base_rules.mk
+++ b/core/base_rules.mk
@@ -124,10 +124,15 @@
 ###########################################################
 # Pick a name for the intermediate and final targets
 ###########################################################
-LOCAL_INSTALLED_MODULE_STEM := $(LOCAL_MODULE)$(LOCAL_MODULE_SUFFIX)
-LOCAL_BUILT_MODULE_STEM:= $(strip $(LOCAL_BUILT_MODULE_STEM))
+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 := $(strip $(LOCAL_BUILT_MODULE_STEM))
 ifeq ($(LOCAL_BUILT_MODULE_STEM),)
-LOCAL_BUILT_MODULE_STEM:= $(LOCAL_INSTALLED_MODULE_STEM)
+  LOCAL_BUILT_MODULE_STEM := $(LOCAL_INSTALLED_MODULE_STEM)
 endif
 
 # OVERRIDE_BUILT_MODULE_PATH is only allowed to be used by the