Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1741facd authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Remove architecture name from names of HOST_*.mk files." into main

parents 596d5147 fc478d29
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@
# limitations under the License.
#

# Configuration for Darwin (Mac OS X) on x86_64.
# Configuration for Darwin (Mac OS X).
# Included by combo/select.mk

define $(combo_var_prefix)transform-shared-lib-to-toc

core/combo/HOST_linux-x86_64.mk

deleted100644 → 0
+0 −22
Original line number Diff line number Diff line
#
# 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.
#

# Configuration for builds hosted on linux-x86_64.
# Included by combo/select.mk

define $(combo_var_prefix)transform-shared-lib-to-toc
$(call _gen_toc_command_for_elf,$(1),$(2))
endef
+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@
# limitations under the License.
#

# Configuration for builds hosted on linux-x86.
# Configuration for builds hosted on linux.
# Included by combo/select.mk

define $(combo_var_prefix)transform-shared-lib-to-toc
+6 −2
Original line number Diff line number Diff line
@@ -21,8 +21,12 @@
#	combo_2nd_arch_prefix -- it's defined if this is loaded for the 2nd arch.
#

ifeq ($(combo_target),HOST_)
  combo_os_arch := $(HOST_OS)
else
  # Build a target string like "linux-arm" or "darwin-x86".
  combo_os_arch := $($(combo_target)OS)-$($(combo_target)$(combo_2nd_arch_prefix)ARCH)
endif

combo_var_prefix := $(combo_2nd_arch_prefix)$(combo_target)