Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f8099c9 authored by Ying Wang's avatar Ying Wang
Browse files

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

(cherry picked from commit c160c3f2)

Change-Id: I5d9b7f7214d98a1bf953fadb9951a8af1e993057
parent 841f6d87

core/executable.mk

+0 −3
Original line number Diff line number Diff line
@@ -70,9 +70,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

core/prebuilt.mk

+0 −9
Original line number Diff line number Diff line
@@ -42,9 +42,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)
@@ -64,9 +61,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
@@ -82,9 +76,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

core/shared_library.mk

+0 −3
Original line number Diff line number Diff line
@@ -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

core/static_library.mk

+0 −3
Original line number Diff line number Diff line
@@ -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