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

Commit e8d9f8cd authored by Dan Shi's avatar Dan Shi Committed by Automerger Merge Worker
Browse files

Merge "Rename VTS to VTS10" am: 916be61b am: ed51dee9 am: 474ebdd3 am: 371d7b51 

Change-Id: I6fc0004682299ac14d9d4f0e898eb9326812061f
parents 578c7225 371d7b51

core/ninja_config.mk

+1 −1
Original line number Original line Diff line number Diff line
@@ -46,7 +46,7 @@ PARSE_TIME_MAKE_GOALS := \ 
	user \

	user \

	userdataimage \

	userdataimage \

	userdebug \

	userdebug \

	vts \

	vts10 \

	win_sdk \

	win_sdk \

	winsdk-tools

	winsdk-tools

core/tasks/general-tests.mk

+2 −2
Original line number Original line Diff line number Diff line
@@ -14,12 +14,12 @@ 




.PHONY: general-tests

.PHONY: general-tests





# TODO(b/149249068): Remove vts-tradefed.jar after all VTS tests are converted

# TODO(b/149249068): Remove vts10-tradefed.jar after all VTS tests are converted

general_tests_tools := \

general_tests_tools := \

    $(HOST_OUT_JAVA_LIBRARIES)/cts-tradefed.jar \

    $(HOST_OUT_JAVA_LIBRARIES)/cts-tradefed.jar \

    $(HOST_OUT_JAVA_LIBRARIES)/compatibility-host-util.jar \

    $(HOST_OUT_JAVA_LIBRARIES)/compatibility-host-util.jar \

    $(HOST_OUT_JAVA_LIBRARIES)/vts-core-tradefed.jar \

    $(HOST_OUT_JAVA_LIBRARIES)/vts-core-tradefed.jar \

    $(HOST_OUT_JAVA_LIBRARIES)/vts-tradefed.jar

    $(HOST_OUT_JAVA_LIBRARIES)/vts10-tradefed.jar





intermediates_dir := $(call intermediates-dir-for,PACKAGING,general-tests)

intermediates_dir := $(call intermediates-dir-for,PACKAGING,general-tests)

general_tests_zip := $(PRODUCT_OUT)/general-tests.zip

general_tests_zip := $(PRODUCT_OUT)/general-tests.zip

target/board/generic_arm64/BoardConfig.mk

+1 −1
Original line number Original line Diff line number Diff line
@@ -23,7 +23,7 @@ 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 vts,$(MAKECMDGOALS)),)

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

# DO NOT USE

# DO NOT USE

# DO NOT USE

# DO NOT USE

#

#