commit 7da0b47f5aefc881f5994ff40cdcb6b7b1f53558
author maxwen <max.weninger@gmail.com> Sat Oct 03 17:54:28 2020 +0200
committer Max Weninger <max.weninger@gmail.com> Mon Oct 12 20:05:35 2020 +0200
tree c18b3337a31c14432389a922c6b02eefdd735669
parent c963ed54bad82a4b1796e4a6bb965eb90cab9f4b

vendor: soong: add Target_vold_vendor_lib

similiar as Target_init_vendor_lib but for vold

Change-Id: I70d2443e94b562cbdc0b5c3d62fd14d4479a11c4

build/soong/android/variable.go

diff --git a/build/soong/android/variable.go b/build/soong/android/variable.go
index da8ed0e..169b5fd 100644
--- a/build/soong/android/variable.go
+++ b/build/soong/android/variable.go
@@ -29,6 +29,10 @@
         Cflags []string
         Whole_static_libs []string
     }
+    Target_vold_vendor_lib struct {
+        Static_libs []string
+        Cflags []string
+    }
 }
 
 type ProductVariables struct {
@@ -41,5 +45,6 @@
     Target_motorized_camera                 *bool `json:",omitempty"`
     Target_init_vendor_lib                  *string `json:",omitempty"`
     Target_enforce_ab_ota_partition_list    *bool `json:",omitempty"`
-	Target_surfaceflinger_fod_lib            *string `json:",omitempty"`
+    Target_surfaceflinger_fod_lib            *string `json:",omitempty"`
+    Target_vold_vendor_lib                  *string `json:",omitempty"`
 }

build/soong/soong_config.mk

diff --git a/build/soong/soong_config.mk b/build/soong/soong_config.mk
index 6f28db5..b096a84 100644
--- a/build/soong/soong_config.mk
+++ b/build/soong/soong_config.mk
@@ -13,6 +13,7 @@
 $(call add_json_str_omitempty, Target_init_vendor_lib, 	      $(TARGET_INIT_VENDOR_LIB))
 $(call add_json_bool, Target_enforce_ab_ota_partition_list,   $(filter true,$(TARGET_ENFORCE_AB_OTA_PARTITION_LIST)))
 $(call add_json_str_omitempty, Target_surfaceflinger_fod_lib, $(TARGET_SURFACEFLINGER_FOD_LIB))
+$(call add_json_str_omitempty, Target_vold_vendor_lib, 	      $(TARGET_VOLD_VENDOR_LIB))
 
 # This causes the build system to strip out the last comma in our nested struct, to keep the JSON valid.
 _json_contents := $(_json_contents)__SV_END