Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc-dev am: 65b4d916e6 am: 60d6fe7552 am: cfbb865e29 am: 2d28e0372a -s ours am: 15d200c399 am: 0d1b7e183d am: 25eee603c8 -s ours am: a562f661ca -s ours am: a65c03517e -s ours am: 1215b2f770 -s ours am: 5c7aef3747 -s ours am: ff70113263 am: 801a62fe07 am: 0fbc9f7c34
am: ffa21071da -s ours
Change-Id: I0afa616f91c55cce1a2a53c7b3b9aeadbcb07b70
diff --git a/target/board/generic_arm64_a/BoardConfig.mk b/target/board/generic_arm64_a/BoardConfig.mk
index 4ecfee6..e92f84d 100644
--- a/target/board/generic_arm64_a/BoardConfig.mk
+++ b/target/board/generic_arm64_a/BoardConfig.mk
@@ -17,6 +17,9 @@
# Common boardconfig settings for generic AOSP products targetting mobile
# (phone/table) devices.
+# System properties
+TARGET_SYSTEM_PROP := build/make/target/board/treble_system.prop
+
# Bootloader is not part of generic AOSP image
TARGET_NO_BOOTLOADER := true
diff --git a/target/board/generic_arm64_a/system.prop b/target/board/generic_arm64_a/system.prop
deleted file mode 100644
index e69de29..0000000
--- a/target/board/generic_arm64_a/system.prop
+++ /dev/null
diff --git a/target/board/generic_arm64_ab/BoardConfig.mk b/target/board/generic_arm64_ab/BoardConfig.mk
index d1bba39..83e44a5 100644
--- a/target/board/generic_arm64_ab/BoardConfig.mk
+++ b/target/board/generic_arm64_ab/BoardConfig.mk
@@ -17,6 +17,9 @@
# Common boardconfig settings for generic AOSP products targetting mobile
# (phone/table) devices.
+# System properties
+TARGET_SYSTEM_PROP := build/make/target/board/treble_system.prop
+
# Bootloader is not part of generic AOSP image
TARGET_NO_BOOTLOADER := true
diff --git a/target/board/generic_arm64_ab/system.prop b/target/board/generic_arm64_ab/system.prop
deleted file mode 100644
index e69de29..0000000
--- a/target/board/generic_arm64_ab/system.prop
+++ /dev/null
diff --git a/target/board/generic_arm_a/BoardConfig.mk b/target/board/generic_arm_a/BoardConfig.mk
index db3e394..0391248 100644
--- a/target/board/generic_arm_a/BoardConfig.mk
+++ b/target/board/generic_arm_a/BoardConfig.mk
@@ -17,6 +17,9 @@
# Common boardconfig settings for generic AOSP products targetting mobile
# (phone/table) devices.
+# System properties
+TARGET_SYSTEM_PROP := build/make/target/board/treble_system.prop
+
# Bootloader is not part of generic AOSP image
TARGET_NO_BOOTLOADER := true
diff --git a/target/board/generic_arm_a/system.prop b/target/board/treble_system.prop
similarity index 100%
rename from target/board/generic_arm_a/system.prop
rename to target/board/treble_system.prop