commit a77d5a2dd66b37cc6f71261b0522b960924f2274
author Morris Lin <morrislin@google.com> Tue Aug 07 21:22:21 2018 +0800
committer Morris Lin <morrislin@google.com> Tue Aug 07 22:17:43 2018 +0800
tree 0360c09cc4eed11790d2efb76e9291a3715968d5
parent 959701f1a821920a4b1ba31f40fea478ca637814

module-info.mk: Output actual module_name.

Add actual module_name information to module-info.json, and atest can
get the actual module name instead of module_name with suffix.

Bug: 77288544

Test: make -j8
      m out/target/product/generic_x86_64/module-info.json

Change-Id: I1e2dfced10db7ef5d31d26dfeb6a6c50a073a519

core/base_rules.mk

diff --git a/core/base_rules.mk b/core/base_rules.mk
index 037b2cb..db09670 100644
--- a/core/base_rules.mk
+++ b/core/base_rules.mk
@@ -748,6 +748,7 @@
 ALL_MODULES.$(my_register_name).FOR_2ND_ARCH := true
 endif
 ALL_MODULES.$(my_register_name).FOR_HOST_CROSS := $(my_host_cross)
+ALL_MODULES.$(my_register_name).MODULE_NAME := $(LOCAL_MODULE)
 ALL_MODULES.$(my_register_name).COMPATIBILITY_SUITES := $(LOCAL_COMPATIBILITY_SUITE)
 
 INSTALLABLE_FILES.$(LOCAL_INSTALLED_MODULE).MODULE := $(my_register_name)