commit | 3fc6731624433804f88ddb5985df76277a022c76 | [log] [tgz] |
---|---|---|
author | Pawin Vongmasa <pawin@google.com> | Thu Jul 20 23:17:12 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jul 20 23:17:12 2017 +0000 |
tree | 2f545d89519078bf2c8022e1374dfa30bba96d2e | |
parent | 0e16c15e31ce285ef568247ef8012935be95de81 [diff] | |
parent | b845ba54650b905b98dc1aa058c3965b8ea8578c [diff] |
Merge "Add libstagefright_soft_flacdec to core_base.mk" into oc-dr1-dev am: 8fc04cc40a am: c194d53411 am: b845ba5465 Change-Id: If6d037daac69b1f3aa7e3c4b8770907c11012852
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