commit 455b4669442d8e4550aaf5554fe89195eea88329
author Rajeev Kumar <rajekumar@google.com> Thu Dec 13 16:57:23 2018 -0800
committer Rajeev Kumar <rajekumar@google.com> Thu Dec 13 17:11:08 2018 -0800
tree 4828502c6f50c903f032845a339daa5d64dcfe9b
parent 28c247166dd3d4ac6f88a9736cd342b0b67bead0

Make sure to not override TARGET_SYSTEM_PROP.

Overriding TARGET_SYSTEM_PROP in wahoo/device.mk file removes system properties set for Android Go devices.

Bug: 120873371
Test: Manual tests
Change-Id: Ib001e5df504e1ba5e146cd242019225aa203f385

device.mk

diff --git a/device.mk b/device.mk
index 6500a80..2e791a6 100755
--- a/device.mk
+++ b/device.mk
@@ -59,7 +59,7 @@
 SRC_DISPLAY_HAL_DIR := hardware/qcom/display/msm8998
 SRC_CAMERA_HAL_DIR := hardware/qcom/camera/msm8998
 
-TARGET_SYSTEM_PROP := $(LOCAL_PATH)/system.prop
+TARGET_SYSTEM_PROP := $(TARGET_SYSTEM_PROP) $(LOCAL_PATH)/system.prop
 
 # Get kernel-headers
 $(call inherit-product, hardware/qcom/msm8998/msm8998.mk)