diff options
| -rw-r--r-- | core/executable_internal.mk | 2 | ||||
| -rw-r--r-- | core/host_executable.mk | 2 | ||||
| -rw-r--r-- | core/host_shared_library.mk | 2 | ||||
| -rw-r--r-- | core/prebuilt_internal.mk | 7 | ||||
| -rw-r--r-- | core/shared_library_internal.mk | 2 |
5 files changed, 7 insertions, 8 deletions
diff --git a/core/executable_internal.mk b/core/executable_internal.mk index 1edcd2c..a1ce7f2 100644 --- a/core/executable_internal.mk +++ b/core/executable_internal.mk @@ -17,7 +17,7 @@ $(call target-executable-hook) skip_build_from_source := ifdef LOCAL_PREBUILT_MODULE_FILE ifeq (,$(call if-build-from-source,$(LOCAL_MODULE),$(LOCAL_PATH))) -include $(BUILD_PREBUILT) +include $(BUILD_SYSTEM)/prebuilt_internal.mk skip_build_from_source := true endif endif diff --git a/core/host_executable.mk b/core/host_executable.mk index ab0f8f3..ffb35d2 100644 --- a/core/host_executable.mk +++ b/core/host_executable.mk @@ -18,7 +18,7 @@ $(call host-executable-hook) skip_build_from_source := ifdef LOCAL_PREBUILT_MODULE_FILE ifeq (,$(call if-build-from-source,$(LOCAL_MODULE),$(LOCAL_PATH))) -include $(BUILD_PREBUILT) +include $(BUILD_SYSTEM)/prebuilt_internal.mk skip_build_from_source := true endif endif diff --git a/core/host_shared_library.mk b/core/host_shared_library.mk index a608251..56ced01 100644 --- a/core/host_shared_library.mk +++ b/core/host_shared_library.mk @@ -27,7 +27,7 @@ $(call host-shared-library-hook) skip_build_from_source := ifdef LOCAL_PREBUILT_MODULE_FILE ifeq (,$(call if-build-from-source,$(LOCAL_MODULE),$(LOCAL_PATH))) -include $(BUILD_PREBUILT) +include $(BUILD_SYSTEM)/prebuilt_internal.mk skip_build_from_source := true endif endif diff --git a/core/prebuilt_internal.mk b/core/prebuilt_internal.mk index 18bddc5..01e0954 100644 --- a/core/prebuilt_internal.mk +++ b/core/prebuilt_internal.mk @@ -86,12 +86,13 @@ endif # prebuilt_module_is_a_library # of the shared libraries are determined. ifdef LOCAL_INSTALLED_MODULE 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, # since we use -rpath-link which points to the built module's path. 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), \ $(LOCAL_SHARED_LIBRARIES))) $(LOCAL_BUILT_MODULE) : $(built_shared_libraries) @@ -213,5 +214,3 @@ endif # TARGET JAVA_LIBRARIES $(built_module) : $(LOCAL_ADDITIONAL_DEPENDENCIES) my_prebuilt_src_file := - -LOCAL_2ND_ARCH_VAR_PREFIX := diff --git a/core/shared_library_internal.mk b/core/shared_library_internal.mk index c42cf37..b5ac32a 100644 --- a/core/shared_library_internal.mk +++ b/core/shared_library_internal.mk @@ -25,7 +25,7 @@ $(call target-shared-library-hook) skip_build_from_source := ifdef LOCAL_PREBUILT_MODULE_FILE ifeq (,$(call if-build-from-source,$(LOCAL_MODULE),$(LOCAL_PATH))) -include $(BUILD_PREBUILT) +include $(BUILD_SYSTEM)/prebuilt_internal.mk skip_build_from_source := true endif endif |