From 0548439172cf7ac821099b5823840728496ca706 Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Tue, 30 Jul 2019 08:41:49 -0700
Subject: [PATCH] Remove PRODUCT_IOT.

Test: treehugger
Change-Id: Ic214ebda6c65e7e51e39151b10f4ce965b35c121
---
 core/config.mk       | 1 +
 core/product.mk      | 3 ---
 core/soong_config.mk | 2 --
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/core/config.mk b/core/config.mk
index a6a76cbd18..55b269d8ee 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -118,6 +118,7 @@ $(KATI_obsolete_var \
   ARCH_X86_HAVE_SSE4_2 \
   ARCH_X86_HAVE_SSSE3 \
 )
+$(KATI_obsolete_var PRODUCT_IOT)
 
 # Used to force goals to build.  Only use for conditionally defined goals.
 .PHONY: FORCE
diff --git a/core/product.mk b/core/product.mk
index 1afd26b760..c54583dc4c 100644
--- a/core/product.mk
+++ b/core/product.mk
@@ -280,9 +280,6 @@ _product_single_value_vars += PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD
 # Make this art variable visible to soong_config.mk.
 _product_single_value_vars += PRODUCT_ART_USE_READ_BARRIER
 
-# Whether the product is an Android Things variant.
-_product_single_value_vars += PRODUCT_IOT
-
 # Add reserved headroom to a system image.
 _product_single_value_vars += PRODUCT_SYSTEM_HEADROOM
 
diff --git a/core/soong_config.mk b/core/soong_config.mk
index 3e60a83d56..6737472f4b 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -136,8 +136,6 @@ $(call add_json_list, BootJars,                          $(PRODUCT_BOOT_JARS))
 
 $(call add_json_bool, VndkUseCoreVariant,                $(TARGET_VNDK_USE_CORE_VARIANT))
 
-$(call add_json_bool, Product_is_iot,                    $(filter true,$(PRODUCT_IOT)))
-
 $(call add_json_bool, Treble_linker_namespaces,          $(filter true,$(PRODUCT_TREBLE_LINKER_NAMESPACES)))
 $(call add_json_bool, Enforce_vintf_manifest,            $(filter true,$(PRODUCT_ENFORCE_VINTF_MANIFEST)))