From 12c25a679802372487886a1355da12ab31377f88 Mon Sep 17 00:00:00 2001
From: Danny Lin <danny@kdrag0n.dev>
Date: Fri, 17 Dec 2021 15:46:30 -0800
Subject: [PATCH] build: soong-info: Preserve module_name

module_name isn't exactly the same as keys in the module map, and we
need it to handle multilib correctly.
---
 src/build/soong-info.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/build/soong-info.ts b/src/build/soong-info.ts
index 0be7b06..2162759 100644
--- a/src/build/soong-info.ts
+++ b/src/build/soong-info.ts
@@ -4,11 +4,11 @@ export interface TargetModuleInfo {
   tags: Array<string>
   installed: Array<string>
   srcs: Array<string>
+  module_name: string
 
   // Removed to reduce size in SystemState
   compatibility_suites?: Array<string>
   auto_test_config?: Array<string>
-  module_name?: string
   test_config?: Array<string>
   dependencies?: Array<string>
   srcjars?: Array<string>
@@ -48,7 +48,6 @@ export function minimizeModules(info: SoongModuleInfo) {
 
     delete module.compatibility_suites
     delete module.auto_test_config
-    delete module.module_name
     delete module.test_config
     delete module.dependencies
     delete module.srcjars