Don't reset LOCAL_*MODULE_STEM.
By resetting we lose LOCAL_*MODULE_STEM values for the second include of the *_internal.mk. We don't need to reset because we now store the default value to a temporary variable my_*module_stem in configure_module_stem.mk. Bug: 27775991 Change-Id: I36d1ff3d177818677fb38bdb3d340dd2ff34c404
This commit is contained in:
parent
da7fef62aa
commit
c160c3f21a
|
@ -74,9 +74,6 @@ ifeq ($(my_module_arch_supported),true)
|
|||
OVERRIDE_BUILT_MODULE_PATH :=
|
||||
LOCAL_BUILT_MODULE :=
|
||||
LOCAL_INSTALLED_MODULE :=
|
||||
LOCAL_MODULE_STEM :=
|
||||
LOCAL_BUILT_MODULE_STEM :=
|
||||
LOCAL_INSTALLED_MODULE_STEM :=
|
||||
LOCAL_INTERMEDIATE_TARGETS :=
|
||||
include $(BUILD_SYSTEM)/executable_internal.mk
|
||||
endif
|
||||
|
|
|
@ -46,9 +46,6 @@ ifeq ($(my_module_arch_supported),true)
|
|||
OVERRIDE_BUILT_MODULE_PATH :=
|
||||
LOCAL_BUILT_MODULE :=
|
||||
LOCAL_INSTALLED_MODULE :=
|
||||
LOCAL_MODULE_STEM :=
|
||||
LOCAL_BUILT_MODULE_STEM :=
|
||||
LOCAL_INSTALLED_MODULE_STEM :=
|
||||
LOCAL_INTERMEDIATE_TARGETS :=
|
||||
include $(BUILD_SYSTEM)/prebuilt_internal.mk
|
||||
endif # $(my_module_arch_supported)
|
||||
|
@ -68,9 +65,6 @@ ifeq ($(my_module_arch_supported),true)
|
|||
OVERRIDE_BUILT_MODULE_PATH :=
|
||||
LOCAL_BUILT_MODULE :=
|
||||
LOCAL_INSTALLED_MODULE :=
|
||||
LOCAL_MODULE_STEM :=
|
||||
LOCAL_BUILT_MODULE_STEM :=
|
||||
LOCAL_INSTALLED_MODULE_STEM :=
|
||||
LOCAL_INTERMEDIATE_TARGETS :=
|
||||
include $(BUILD_SYSTEM)/prebuilt_internal.mk
|
||||
endif
|
||||
|
@ -86,9 +80,6 @@ ifeq ($(my_module_arch_supported),true)
|
|||
OVERRIDE_BUILT_MODULE_PATH :=
|
||||
LOCAL_BUILT_MODULE :=
|
||||
LOCAL_INSTALLED_MODULE :=
|
||||
LOCAL_MODULE_STEM :=
|
||||
LOCAL_BUILT_MODULE_STEM :=
|
||||
LOCAL_INSTALLED_MODULE_STEM :=
|
||||
LOCAL_INTERMEDIATE_TARGETS :=
|
||||
include $(BUILD_SYSTEM)/prebuilt_internal.mk
|
||||
endif
|
||||
|
|
|
@ -38,9 +38,6 @@ ifeq ($(my_module_arch_supported),true)
|
|||
OVERRIDE_BUILT_MODULE_PATH :=
|
||||
LOCAL_BUILT_MODULE :=
|
||||
LOCAL_INSTALLED_MODULE :=
|
||||
LOCAL_MODULE_STEM :=
|
||||
LOCAL_BUILT_MODULE_STEM :=
|
||||
LOCAL_INSTALLED_MODULE_STEM :=
|
||||
LOCAL_INTERMEDIATE_TARGETS :=
|
||||
|
||||
include $(BUILD_SYSTEM)/shared_library_internal.mk
|
||||
|
|
|
@ -23,9 +23,6 @@ ifeq ($(my_module_arch_supported),true)
|
|||
OVERRIDE_BUILT_MODULE_PATH :=
|
||||
LOCAL_BUILT_MODULE :=
|
||||
LOCAL_INSTALLED_MODULE :=
|
||||
LOCAL_MODULE_STEM :=
|
||||
LOCAL_BUILT_MODULE_STEM :=
|
||||
LOCAL_INSTALLED_MODULE_STEM :=
|
||||
LOCAL_INTERMEDIATE_TARGETS :=
|
||||
|
||||
include $(BUILD_SYSTEM)/static_library_internal.mk
|
||||
|
|
Loading…
Reference in New Issue