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

Commit f5bd443a authored by Julien Desprez's avatar Julien Desprez
Browse files

Remove CTS as a check with MAKECMDGOALS 

a new board type: aosp_arm64_plus_armv7 has been introduced to specifically build the combination if needed.

Change-Id: I435c5a6b33973ec0495306ef19afc1140b7742bf
Test: presubmit
Bug: 344958592
parent 9ea8ad92

core/ninja_config.mk

+0 −1
Original line number Original line Diff line number Diff line
@@ -19,7 +19,6 @@ PARSE_TIME_MAKE_GOALS := \ 
	build-art% \

	build-art% \

	build_kernel-nodeps \

	build_kernel-nodeps \

	clean-oat% \

	clean-oat% \

	cts \

	custom_images \

	custom_images \

	dicttool_aosp \

	dicttool_aosp \

	docs \

	docs \

target/board/generic_arm64/BoardConfig.mk

+2 −2
Original line number Original line Diff line number Diff line
@@ -23,14 +23,14 @@ TARGET_2ND_ARCH := arm 
TARGET_2ND_CPU_ABI := armeabi-v7a

TARGET_2ND_CPU_ABI := armeabi-v7a

TARGET_2ND_CPU_ABI2 := armeabi

TARGET_2ND_CPU_ABI2 := armeabi





ifneq ($(TARGET_BUILD_APPS)$(filter cts sdk,$(MAKECMDGOALS)),)

ifneq ($(TARGET_BUILD_APPS)$(filter sdk,$(MAKECMDGOALS)),)

# DO NOT USE

# DO NOT USE

# DO NOT USE

# DO NOT USE

#

#

# This architecture / CPU variant must NOT be used for any 64 bit

# This architecture / CPU variant must NOT be used for any 64 bit

# platform builds. It is the lowest common denominator required

# platform builds. It is the lowest common denominator required

# to build an unbundled application or cts for all supported 32 and 64 bit

# to build an unbundled application or cts for all supported 32 and 64 bit

# platforms.

# platforms. It now recommended to use generic_arm64_plus_armv7 to achieve this.

#

#

# If you're building a 64 bit platform (and not an application) the

# If you're building a 64 bit platform (and not an application) the

# ARM-v8 specification allows you to assume all the features available in an

# ARM-v8 specification allows you to assume all the features available in an