StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix prebuilt library dependency for multilib build

Browse Source 
Also we don't need to include module_arch_supported.mk again, if we are
currently substituting the source build with LOCAL_PREBUILT_MODULE_FILE.

Change-Id: I444b0397d74c3153b398a050b762e49418062a86
This commit is contained in:
Ying Wang
2014-02-25 18:26:29 -08:00
parent 9dba192b76
commit 58f462fccf
5 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/executable_internal.mk
View File

@@ -17,7 +17,7 @@ $(call target-executable-hook)
skip_build_from_source := skip_build_from_source :=
ifdef LOCAL_PREBUILT_MODULE_FILE ifdef LOCAL_PREBUILT_MODULE_FILE
ifeq (,$(call if-build-from-source,$(LOCAL_MODULE),$(LOCAL_PATH))) ifeq (,$(call if-build-from-source,$(LOCAL_MODULE),$(LOCAL_PATH)))
include $(BUILD_PREBUILT) include $(BUILD_SYSTEM)/prebuilt_internal.mk
skip_build_from_source := true skip_build_from_source := true
endif endif
endif endif

2
core/host_executable.mk
View File

@@ -18,7 +18,7 @@ $(call host-executable-hook)
skip_build_from_source := skip_build_from_source :=
ifdef LOCAL_PREBUILT_MODULE_FILE ifdef LOCAL_PREBUILT_MODULE_FILE
ifeq (,$(call if-build-from-source,$(LOCAL_MODULE),$(LOCAL_PATH))) ifeq (,$(call if-build-from-source,$(LOCAL_MODULE),$(LOCAL_PATH)))
include $(BUILD_PREBUILT) include $(BUILD_SYSTEM)/prebuilt_internal.mk
skip_build_from_source := true skip_build_from_source := true
endif endif
endif endif

2
core/host_shared_library.mk
View File

@@ -27,7 +27,7 @@ $(call host-shared-library-hook)
skip_build_from_source := skip_build_from_source :=
ifdef LOCAL_PREBUILT_MODULE_FILE ifdef LOCAL_PREBUILT_MODULE_FILE
ifeq (,$(call if-build-from-source,$(LOCAL_MODULE),$(LOCAL_PATH))) ifeq (,$(call if-build-from-source,$(LOCAL_MODULE),$(LOCAL_PATH)))
include $(BUILD_PREBUILT) include $(BUILD_SYSTEM)/prebuilt_internal.mk
skip_build_from_source := true skip_build_from_source := true
endif endif
endif endif

7
core/prebuilt_internal.mk
View File

@@ -86,12 +86,13 @@ endif # prebuilt_module_is_a_library
# of the shared libraries are determined. # of the shared libraries are determined.
ifdef LOCAL_INSTALLED_MODULE ifdef LOCAL_INSTALLED_MODULE
ifdef LOCAL_SHARED_LIBRARIES ifdef LOCAL_SHARED_LIBRARIES
$(my_prefix)DEPENDENCIES_ON_SHARED_LIBRARIES += $(LOCAL_MODULE):$(LOCAL_INSTALLED_MODULE):$(subst $(space),$(comma),$(LOCAL_SHARED_LIBRARIES)) $(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)DEPENDENCIES_ON_SHARED_LIBRARIES += \
$(LOCAL_MODULE):$(LOCAL_INSTALLED_MODULE):$(subst $(space),$(comma),$(LOCAL_SHARED_LIBRARIES))
# We also need the LOCAL_BUILT_MODULE dependency, # We also need the LOCAL_BUILT_MODULE dependency,
# since we use -rpath-link which points to the built module's path. # since we use -rpath-link which points to the built module's path.
built_shared_libraries := \ built_shared_libraries := \
$(addprefix $($(my_prefix)OUT_INTERMEDIATE_LIBRARIES)/, \ $(addprefix $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)OUT_INTERMEDIATE_LIBRARIES)/, \
$(addsuffix $($(my_prefix)SHLIB_SUFFIX), \ $(addsuffix $($(my_prefix)SHLIB_SUFFIX), \
$(LOCAL_SHARED_LIBRARIES))) $(LOCAL_SHARED_LIBRARIES)))
$(LOCAL_BUILT_MODULE) : $(built_shared_libraries) $(LOCAL_BUILT_MODULE) : $(built_shared_libraries)
@@ -213,5 +214,3 @@ endif # TARGET JAVA_LIBRARIES
$(built_module) : $(LOCAL_ADDITIONAL_DEPENDENCIES) $(built_module) : $(LOCAL_ADDITIONAL_DEPENDENCIES)
my_prebuilt_src_file := my_prebuilt_src_file :=
LOCAL_2ND_ARCH_VAR_PREFIX :=

2
core/shared_library_internal.mk
View File

@@ -25,7 +25,7 @@ $(call target-shared-library-hook)
skip_build_from_source := skip_build_from_source :=
ifdef LOCAL_PREBUILT_MODULE_FILE ifdef LOCAL_PREBUILT_MODULE_FILE
ifeq (,$(call if-build-from-source,$(LOCAL_MODULE),$(LOCAL_PATH))) ifeq (,$(call if-build-from-source,$(LOCAL_MODULE),$(LOCAL_PATH)))
include $(BUILD_PREBUILT) include $(BUILD_SYSTEM)/prebuilt_internal.mk
skip_build_from_source := true skip_build_from_source := true
endif endif
endif endif