From 5089c11b1ebb42e1e87c251dfa5e8353cd236227 Mon Sep 17 00:00:00 2001 From: Nelson Li Date: Thu, 1 Aug 2019 06:28:05 +0000 Subject: [PATCH] Revert "Remove product_is_iot." This reverts commit 14fa562fbbd89fabc5806734cdaadcdd2e4a577a. Reason for revert: Broken build on 5772180 error: frameworks/av/media/utils/Android.bp:49:23: unrecognized property "product_variables.product_is_iot" Bug: 138764596 Change-Id: I37944dfb974e4180a683361f514b404f92b943e5 --- android/variable.go | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/android/variable.go b/android/variable.go index bfff81ca4..e9379b792 100644 --- a/android/variable.go +++ b/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"`