diff options
| author | Anton Hansson <hansson@google.com> | 2021-01-13 18:09:08 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-01-13 18:09:08 +0000 |
| commit | 8aec0e51b93487f775a05f061d453365c95b42ae (patch) | |
| tree | 74fca80e686a63132e6fa1b1b90bfdd1d27f094a | |
| parent | 6d4300451a17d814eaef102090bf9aa973ad5a96 (diff) | |
| parent | c0423c8dae0e571e90d06cdced6c70a67d91cbf5 (diff) | |
| download | build-8aec0e51b93487f775a05f061d453365c95b42ae.tar.gz | |
Merge "Use 64 bit binder in module builds" into mainline-prod
| -rw-r--r-- | target/board/BoardConfigModuleCommon.mk | 6 | ||||
| -rw-r--r-- | target/board/module_arm/BoardConfig.mk | 2 | ||||
| -rw-r--r-- | target/board/module_arm64/BoardConfig.mk | 2 | ||||
| -rw-r--r-- | target/board/module_x86/BoardConfig.mk | 2 | ||||
| -rw-r--r-- | target/board/module_x86_64/BoardConfig.mk | 2 |
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 |