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

Commit 07ad8765 authored by Ying Wang's avatar Ying Wang Committed by android-build-merger
Browse files

Merge "Don\'t reset LOCAL_*MODULE_STEM." 

am: e77e5e7b

* commit 'e77e5e7b':
  Don't reset LOCAL_*MODULE_STEM.

Change-Id: I642dd9ec7a9ba3ae9a4a5f0b3c889fbf22c48353
parents b077e80d e77e5e7b

core/executable.mk

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

core/prebuilt.mk

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

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