Merge "Revert "Remove product_is_iot."" am: 604374742d am: 742677d7b6 am: 171f6bfa7b

am: b9d3f26dab

Change-Id: I6e299afb20777a886fbf8d4ae46bea582ac9b933

android/variable.go

@@ -59,6 +59,17 @@ type variableProperties struct {
 			Cflags []string
 		}
 
+		// Product_is_iot is true for Android Things devices.
+		Product_is_iot struct {
+			Cflags       []string
+			Enabled      bool
+			Exclude_srcs []string
+			Init_rc      []string
+			Shared_libs  []string
+			Srcs         []string
+			Static_libs  []string
+		}
+
 		// treble_linker_namespaces is true when the system/vendor linker namespace separation is
 		// enabled.
 		Treble_linker_namespaces struct {
@@ -251,6 +262,8 @@ type productVariables struct {
 
 	Override_rs_driver *string `json:",omitempty"`
 
+	Product_is_iot *bool `json:",omitempty"`
+
 	Fuchsia *bool `json:",omitempty"`
 
 	DeviceKernelHeaders []string `json:",omitempty"`