From ba36f4c1392610c66200b12fc15d0ed811889eff Mon Sep 17 00:00:00 2001
From: Inseob Kim <inseob@google.com>
Date: Thu, 17 Oct 2019 10:30:35 +0000
Subject: [PATCH 1/2] Revert "Set BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW on sdk
 and full"

This reverts commit 98568893810c5490b05047716ed7ad4be34fb093.

Reason for revert: The fix aosp/1145211 has been merged.

Change-Id: I70b37bbee69ac3df6a603e2641f52f6025fb9584
---
 target/product/full.mk             | 3 ---
 target/product/full_x86.mk         | 3 ---
 target/product/sdk_phone_arm64.mk  | 3 +--
 target/product/sdk_phone_armv7.mk  | 3 ---
 target/product/sdk_phone_x86.mk    | 3 ---
 target/product/sdk_phone_x86_64.mk | 3 ---
 6 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/target/product/full.mk b/target/product/full.mk
index 2cda6d04f..b356f9d42 100644
--- a/target/product/full.mk
+++ b/target/product/full.mk
@@ -31,6 +31,3 @@ PRODUCT_NAME := full
 PRODUCT_DEVICE := generic
 PRODUCT_BRAND := Android
 PRODUCT_MODEL := AOSP on ARM Emulator
-
-# TODO(b/131162102): remove this after cleaning up accesses of sysprop
-BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW := true
diff --git a/target/product/full_x86.mk b/target/product/full_x86.mk
index 05e8e38ff..55c450a80 100644
--- a/target/product/full_x86.mk
+++ b/target/product/full_x86.mk
@@ -44,6 +44,3 @@ PRODUCT_NAME := full_x86
 PRODUCT_DEVICE := generic_x86
 PRODUCT_BRAND := Android
 PRODUCT_MODEL := AOSP on IA Emulator
-
-# TODO(b/131162102): remove this after cleaning up accesses of sysprop
-BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW := true
diff --git a/target/product/sdk_phone_arm64.mk b/target/product/sdk_phone_arm64.mk
index 7592fa7a9..ad726333a 100644
--- a/target/product/sdk_phone_arm64.mk
+++ b/target/product/sdk_phone_arm64.mk
@@ -31,5 +31,4 @@ PRODUCT_NAME := sdk_phone_arm64
 PRODUCT_DEVICE := generic_arm64
 PRODUCT_MODEL := Android SDK built for arm64
 
-# TODO(b/131162102): remove this after cleaning up accesses of sysprop
-BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW := true
+
diff --git a/target/product/sdk_phone_armv7.mk b/target/product/sdk_phone_armv7.mk
index 950a531e5..77b8b5064 100644
--- a/target/product/sdk_phone_armv7.mk
+++ b/target/product/sdk_phone_armv7.mk
@@ -30,6 +30,3 @@ PRODUCT_PACKAGES += \
 PRODUCT_BRAND := Android
 PRODUCT_NAME := sdk_phone_armv7
 PRODUCT_DEVICE := generic
-
-# TODO(b/131162102): remove this after cleaning up accesses of sysprop
-BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW := true
diff --git a/target/product/sdk_phone_x86.mk b/target/product/sdk_phone_x86.mk
index 59d234367..efb3c6e70 100644
--- a/target/product/sdk_phone_x86.mk
+++ b/target/product/sdk_phone_x86.mk
@@ -49,6 +49,3 @@ PRODUCT_BRAND := Android
 PRODUCT_NAME := sdk_phone_x86
 PRODUCT_DEVICE := generic_x86
 PRODUCT_MODEL := Android SDK built for x86
-
-# TODO(b/131162102): remove this after cleaning up accesses of sysprop
-BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW := true
diff --git a/target/product/sdk_phone_x86_64.mk b/target/product/sdk_phone_x86_64.mk
index c342159ca..267796f39 100644
--- a/target/product/sdk_phone_x86_64.mk
+++ b/target/product/sdk_phone_x86_64.mk
@@ -51,6 +51,3 @@ PRODUCT_BRAND := Android
 PRODUCT_NAME := sdk_phone_x86_64
 PRODUCT_DEVICE := generic_x86_64
 PRODUCT_MODEL := Android SDK built for x86_64
-
-# TODO(b/131162102): remove this after cleaning up accesses of sysprop
-BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW := true

From 5d60c8ac5dbb992596d594e38c3aba7565ba7861 Mon Sep 17 00:00:00 2001
From: Inseob Kim <inseob@google.com>
Date: Thu, 17 Oct 2019 10:32:59 +0000
Subject: [PATCH 2/2] Revert "Do not initialize
 BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW"

This reverts commit 3b82e07023c6561c9fcb4ba87f07f2a2a003ab5c.

Reason for revert: This was a hack and the fix has been merged

Change-Id: Ifa1684d9908f384d3da86acae18bfe4b47cf1529
---
 core/board_config.mk | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/core/board_config.mk b/core/board_config.mk
index 973182b24..4c128f118 100644
--- a/core/board_config.mk
+++ b/core/board_config.mk
@@ -87,6 +87,7 @@ _board_strip_readonly_list += $(_dynamic_partitions_var_list)
 _build_broken_var_list := \
   BUILD_BROKEN_DUP_RULES \
   BUILD_BROKEN_PREBUILT_ELF_FILES \
+  BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW \
   BUILD_BROKEN_USES_NETWORK \
 
 _build_broken_var_list += \
@@ -108,10 +109,6 @@ endif
 # ###############################################################
 $(foreach v,$(_build_broken_var_list),$(eval $(v) :=))
 
-# Build broken vars without default initialization above
-_build_broken_var_list += \
-  BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW
-
 # Boards may be defined under $(SRC_TARGET_DIR)/board/$(TARGET_DEVICE)
 # or under vendor/*/$(TARGET_DEVICE).  Search in both places, but
 # make sure only one exists.