diff options
| author | 2016-04-19 12:13:54 -0700 | |
|---|---|---|
| committer | 2016-04-19 12:20:47 -0700 | |
| commit | c160c3f21a878bebcc94e0a282a6b2b899b356bb (patch) | |
| tree | 943a2f8007b041635e46104395962f11b12237e4 | |
| parent | da7fef62aa60da65a9f183cf82c14b6aa7694aff (diff) | |
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
| -rw-r--r-- | core/executable.mk | 3 | ||||
| -rw-r--r-- | core/prebuilt.mk | 9 | ||||
| -rw-r--r-- | core/shared_library.mk | 3 | ||||
| -rw-r--r-- | core/static_library.mk | 3 |
4 files changed, 0 insertions, 18 deletions
diff --git a/core/executable.mk b/core/executable.mk index 6091a52eab..1bd9db12ab 100644 --- a/core/executable.mk +++ b/core/executable.mk @@ -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 diff --git a/core/prebuilt.mk b/core/prebuilt.mk index 776827a043..f1edc8ac0c 100644 --- a/core/prebuilt.mk +++ b/core/prebuilt.mk @@ -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 diff --git a/core/shared_library.mk b/core/shared_library.mk index 73aca78c53..2f483414a2 100644 --- a/core/shared_library.mk +++ b/core/shared_library.mk @@ -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 diff --git a/core/static_library.mk b/core/static_library.mk index 854cbfcb96..a8ae399b68 100644 --- a/core/static_library.mk +++ b/core/static_library.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 |