diff options
author | Dan Willemsen <dwillemsen@google.com> | 2021-12-08 22:59:34 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-08 22:59:34 +0000 |
commit | b66a55ea05a41708a8d542a695a6344f778c9b1c (patch) | |
tree | d07a6f7c7ddbdf07b63c9006f46ef8487b7ba76f | |
parent | 37d01f684df047b6bcd3e814b054357230d9a5a3 (diff) | |
parent | e808bc4a09bf24367a6c700842ba21418b40fe52 (diff) | |
download | build-b66a55ea05a41708a8d542a695a6344f778c9b1c.tar.gz |
Merge "Add basic Darwin+Arm64 support as HOST_CROSS" am: e808bc4a09
Original change: https://android-review.googlesource.com/c/platform/build/+/1883492
Change-Id: If566a5f3a588db74cc6d54d4c107c0f1c88bea4c
-rw-r--r-- | core/combo/HOST_CROSS_linux_bionic-arm64.mk | 22 | ||||
-rw-r--r-- | core/combo/HOST_CROSS_windows-x86.mk | 23 | ||||
-rw-r--r-- | core/combo/HOST_CROSS_windows-x86_64.mk | 23 | ||||
-rw-r--r-- | core/combo/select.mk | 9 | ||||
-rw-r--r-- | core/envsetup.mk | 4 |
5 files changed, 13 insertions, 68 deletions
diff --git a/core/combo/HOST_CROSS_linux_bionic-arm64.mk b/core/combo/HOST_CROSS_linux_bionic-arm64.mk deleted file mode 100644 index df6865f808..0000000000 --- a/core/combo/HOST_CROSS_linux_bionic-arm64.mk +++ /dev/null @@ -1,22 +0,0 @@ -# -# Copyright (C) 2020 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# Configuration for builds hosted on linux_arm-arm64 -# Included by combo/select.mk - -define $(combo_var_prefix)transform-shared-lib-to-toc -$(call _gen_toc_command_for_elf,$(1),$(2)) -endef diff --git a/core/combo/HOST_CROSS_windows-x86.mk b/core/combo/HOST_CROSS_windows-x86.mk deleted file mode 100644 index d924901604..0000000000 --- a/core/combo/HOST_CROSS_windows-x86.mk +++ /dev/null @@ -1,23 +0,0 @@ -# -# Copyright (C) 2006 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# Settings to use MinGW as a cross-compiler under Linux -# Included by combo/select.make - -define $(combo_var_prefix)transform-shared-lib-to-toc -$(hide) $($(PRIVATE_2ND_ARCH_VAR_PREFIX)$(PRIVATE_PREFIX)OBJDUMP) -x $(1) | grep "^Name" | cut -f3 -d" " > $(2) -$(hide) $($(PRIVATE_2ND_ARCH_VAR_PREFIX)$(PRIVATE_PREFIX)NM) -g -f p $(1) | cut -f1-2 -d" " >> $(2) -endef diff --git a/core/combo/HOST_CROSS_windows-x86_64.mk b/core/combo/HOST_CROSS_windows-x86_64.mk deleted file mode 100644 index d924901604..0000000000 --- a/core/combo/HOST_CROSS_windows-x86_64.mk +++ /dev/null @@ -1,23 +0,0 @@ -# -# Copyright (C) 2006 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# Settings to use MinGW as a cross-compiler under Linux -# Included by combo/select.make - -define $(combo_var_prefix)transform-shared-lib-to-toc -$(hide) $($(PRIVATE_2ND_ARCH_VAR_PREFIX)$(PRIVATE_PREFIX)OBJDUMP) -x $(1) | grep "^Name" | cut -f3 -d" " > $(2) -$(hide) $($(PRIVATE_2ND_ARCH_VAR_PREFIX)$(PRIVATE_PREFIX)NM) -g -f p $(1) | cut -f1-2 -d" " >> $(2) -endef diff --git a/core/combo/select.mk b/core/combo/select.mk index 33c8e6d404..761755866c 100644 --- a/core/combo/select.mk +++ b/core/combo/select.mk @@ -27,6 +27,13 @@ combo_os_arch := $($(combo_target)OS)-$($(combo_target)$(combo_2nd_arch_prefix)A combo_var_prefix := $(combo_2nd_arch_prefix)$(combo_target) # Set reasonable defaults for the various variables +ifeq ($(combo_target),HOST_CROSS_) +$(KATI_obsolete_var \ + $(combo_var_prefix)GLOBAL_ARFLAGS \ + $(combo_var_prefix)STATIC_LIB_SUFFIX \ + $(combo_var_prefix)transform-shared-lib-to-toc \ + ,HOST_CROSS builds are not supported in Make) +else $(combo_var_prefix)GLOBAL_ARFLAGS := crsPD -format=gnu @@ -34,3 +41,5 @@ $(combo_var_prefix)STATIC_LIB_SUFFIX := .a # Now include the combo for this specific target. include $(BUILD_COMBOS)/$(combo_target)$(combo_os_arch).mk + +endif diff --git a/core/envsetup.mk b/core/envsetup.mk index 21eac7f3b8..b673050441 100644 --- a/core/envsetup.mk +++ b/core/envsetup.mk @@ -167,6 +167,10 @@ ifeq ($(HOST_OS),linux) else $(error Unsupported HOST_CROSS_OS $(HOST_CROSS_OS)) endif +else ifeq ($(HOST_OS),darwin) + HOST_CROSS_OS := darwin + HOST_CROSS_ARCH := arm64 + HOST_CROSS_2ND_ARCH := endif ifeq ($(HOST_OS),) |