aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Hansson <hansson@google.com>2021-01-13 09:32:48 +0000
committerAnton Hansson <hansson@google.com>2021-01-13 11:04:02 +0000
commitc0423c8dae0e571e90d06cdced6c70a67d91cbf5 (patch)
tree04339caa78e6a25ba4cad5b3bb6de71d7d121b72
parent04a80cd736b69c8419ca43fb939ff54773dc78c2 (diff)
downloadbuild-c0423c8dae0e571e90d06cdced6c70a67d91cbf5.tar.gz
Use 64 bit binder in module builds
Add a new BoardConfigModuleCommon for settings of this sort. Bug: 176840868 Test: forrest module coverage build Change-Id: Ie62261ecc0f0967f677a890a382fa1da060f7ff2
-rw-r--r--target/board/BoardConfigModuleCommon.mk6
-rw-r--r--target/board/module_arm/BoardConfig.mk2
-rw-r--r--target/board/module_arm64/BoardConfig.mk2
-rw-r--r--target/board/module_x86/BoardConfig.mk2
-rw-r--r--target/board/module_x86_64/BoardConfig.mk2
5 files changed, 14 insertions, 0 deletions
diff --git a/target/board/BoardConfigModuleCommon.mk b/target/board/BoardConfigModuleCommon.mk
new file mode 100644
index 0000000000..24c01a58ef
--- /dev/null
+++ b/target/board/BoardConfigModuleCommon.mk
@@ -0,0 +1,6 @@
+# BoardConfigModuleCommon.mk
+#
+# Common compile-time settings for module builds.
+
+# Required for all module devices.
+TARGET_USES_64_BIT_BINDER := true
diff --git a/target/board/module_arm/BoardConfig.mk b/target/board/module_arm/BoardConfig.mk
index 565efc8425..3f35c060e1 100644
--- a/target/board/module_arm/BoardConfig.mk
+++ b/target/board/module_arm/BoardConfig.mk
@@ -13,6 +13,8 @@
# limitations under the License.
#
+include build/make/target/board/BoardConfigModuleCommon.mk
+
TARGET_ARCH := arm
TARGET_ARCH_VARIANT := armv7-a-neon
TARGET_CPU_VARIANT := generic
diff --git a/target/board/module_arm64/BoardConfig.mk b/target/board/module_arm64/BoardConfig.mk
index 66e3792640..3700056da3 100644
--- a/target/board/module_arm64/BoardConfig.mk
+++ b/target/board/module_arm64/BoardConfig.mk
@@ -13,6 +13,8 @@
# limitations under the License.
#
+include build/make/target/board/BoardConfigModuleCommon.mk
+
TARGET_ARCH := arm64
TARGET_ARCH_VARIANT := armv8-a
TARGET_CPU_VARIANT := generic
diff --git a/target/board/module_x86/BoardConfig.mk b/target/board/module_x86/BoardConfig.mk
index af3fffd067..a93ac9779c 100644
--- a/target/board/module_x86/BoardConfig.mk
+++ b/target/board/module_x86/BoardConfig.mk
@@ -13,6 +13,8 @@
# limitations under the License.
#
+include build/make/target/board/BoardConfigModuleCommon.mk
+
TARGET_CPU_ABI := x86
TARGET_ARCH := x86
TARGET_ARCH_VARIANT := x86
diff --git a/target/board/module_x86_64/BoardConfig.mk b/target/board/module_x86_64/BoardConfig.mk
index 1ada02729e..1ed3be0ba6 100644
--- a/target/board/module_x86_64/BoardConfig.mk
+++ b/target/board/module_x86_64/BoardConfig.mk
@@ -13,6 +13,8 @@
# limitations under the License.
#
+include build/make/target/board/BoardConfigModuleCommon.mk
+
TARGET_CPU_ABI := x86_64
TARGET_ARCH := x86_64
TARGET_ARCH_VARIANT := x86_64