soong_config: Add new flag for vendor_init
Change-Id: I383f1de230ecf7b79d78fe701b140bd1bc6795f2
diff --git a/build/soong/android/variable.go b/build/soong/android/variable.go
index c588089..6a39cbd 100644
--- a/build/soong/android/variable.go
+++ b/build/soong/android/variable.go
@@ -14,6 +14,7 @@
Cflags []string
}
Target_init_vendor_lib struct {
+ Whole_static_libs []string
Cflags []string
}
@@ -25,5 +26,5 @@
TargetNeedsHWCOnFirstRef *bool `json:",omitempty"`
Uses_metadata_as_fde_key *bool `json:",omitempty"`
Target_use_sdclang *bool `json:",omitempty"`
- Target_init_vendor_lib *bool `json:",omitempty"`
+ Target_init_vendor_lib *string `json:",omitempty"`
}
diff --git a/build/soong/soong_config.mk b/build/soong/soong_config.mk
index c278952..d72e91a 100644
--- a/build/soong/soong_config.mk
+++ b/build/soong/soong_config.mk
@@ -8,8 +8,7 @@
$(call add_json_bool, TargetNeedsHWCOnFirstRef, $(filter true,$(TARGET_NEEDS_HWC_ONFIRSTREF)))
$(call add_json_bool, Uses_metadata_as_fde_key, $(filter true,$(TARGET_USES_METADATA_AS_FDE_KEY)))
$(call add_json_bool, Target_use_sdclang, $(filter true,$(TARGET_USE_SDCLANG)))
-$(call add_json_bool, Target_init_vendor_lib, $(filter true,$(TARGET_INIT_VENDOR_LIB)))
-
+$(call add_json_str_omitempty, Target_init_vendor_lib, $(TARGET_INIT_VENDOR_LIB))
# This causes the build system to strip out the last comma in our nested struct, to keep the JSON valid.
_contents := $(_contents)__SV_END