Merge "droiddoc: Fix trailing ':' in -classpath, -sourcepath values" am: 40594041f4 am: cdcb785c3d am: f485958696 am: 3ca6866bb3
am: 9dab617140
Change-Id: I2c7163e4f621f6146817084f29d3777139cf33c6
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