diff options
| author | David 'Digit' Turner <digit@google.com> | 2011-09-30 05:37:45 +0200 |
|---|---|---|
| committer | David 'Digit' Turner <digit@google.com> | 2011-09-30 05:42:17 +0200 |
| commit | 1322b9f426ef6aca8b6ce569411cdd3443c1caf4 (patch) | |
| tree | 356506a8d6d7e85530bdd84c87057d0931f397ed | |
| parent | 06fc88fc30a2491858960e24cd2cc7385d9c16fa (diff) | |
| download | ndk-1322b9f426ef6aca8b6ce569411cdd3443c1caf4.tar.gz | |
Fix a bug in the computation of installable dependencies
This patch fixes a bug in definitions.mk regarding the list
of installable dependencies for a given application. It ignored
prebuilt shared libraries.
+ Fix another bug where we were not using the prebuilt GAbi++
libraries when using APP_STL := gabi++_shared/static
Change-Id: Iefac2ccc49ee16e8b8e322c64979946d875212d6
| -rw-r--r-- | build/core/definitions.mk | 5 | ||||
| -rw-r--r-- | sources/cxx-stl/gabi++/Android.mk | 10 |
2 files changed, 9 insertions, 6 deletions
diff --git a/build/core/definitions.mk b/build/core/definitions.mk index 9d61038b3..2bd268594 100644 --- a/build/core/definitions.mk +++ b/build/core/definitions.mk @@ -508,7 +508,10 @@ module-get-depends = $(strip $(call modules-get-closure,$1,$2)) # Rationale: This computes the closure of all installable module dependencies starting from $1 # ----------------------------------------------------------------------------- # For now, only the closure of LOCAL_SHARED_LIBRARIES is enough -modules-get-all-installable = $(call module-get-depends,$1,SHARED_LIBRARIES) +modules-get-all-installable = $(strip \ + $(foreach __alldep,$(call module-get-depends,$1,depends),\ + $(if $(call module-is-installable,$(__alldep)),$(__alldep))\ + )) # Return the C++ extension of a given module # $1: module name diff --git a/sources/cxx-stl/gabi++/Android.mk b/sources/cxx-stl/gabi++/Android.mk index 56c8bd318..a4a1fed5e 100644 --- a/sources/cxx-stl/gabi++/Android.mk +++ b/sources/cxx-stl/gabi++/Android.mk @@ -2,19 +2,19 @@ LOCAL_PATH:= $(call my-dir) include $(LOCAL_PATH)/sources.mk -ifneq (,$(GABIXX_FORCE_REBUILD)) +ifeq (,$(GABIXX_FORCE_REBUILD)) include $(CLEAR_VARS) - LOCAL_MODULE:= libgabi++_shared - LOCAL_SRC_FILES:= $(LOCAL_PATH)/libs/$(TARGET_ARCH_ABI)/libgabi++_shared + LOCAL_MODULE:= gabi++_shared + LOCAL_SRC_FILES:= libs/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).so LOCAL_EXPORT_C_INCLUDES := $(libgabi++_c_includes) LOCAL_EXPORT_LDLIBS := -lstdc++ LOCAL_CPP_FEATURES := rtti include $(PREBUILT_SHARED_LIBRARY) include $(CLEAR_VARS) - LOCAL_MODULE:= libgabi++_static - LOCAL_SRC_FILES:= $(LOCAL_PATH)/libs/$(TARGET_ARCH_ABI)/libgabi++_static + LOCAL_MODULE:= gabi++_static + LOCAL_SRC_FILES:= libs/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).a LOCAL_EXPORT_C_INCLUDES := $(libgabi++_c_includes) LOCAL_EXPORT_LDLIBS := -lstdc++ LOCAL_CPP_FEATURES := rtti |