openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Rename VTS to VTS10" am: 916be61b91 am: ed51dee98e 

Change-Id: I4ac161769068887e7575bb1f51a186a4efbe51d6
This commit is contained in:
Dan Shi 2020-03-31 18:01:14 +00:00 committed by Automerger Merge Worker
parent 5af467fbe6 ed51dee98e
commit 474ebdd3e9
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/ninja_config.mk
View File

@ -46,7 +46,7 @@ PARSE_TIME_MAKE_GOALS := \
user \ user \
userdataimage \ userdataimage \
userdebug \ userdebug \
vts \ vts10 \
win_sdk \ win_sdk \
winsdk-tools winsdk-tools

4
core/tasks/general-tests.mk
View File

@ -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

2
target/board/generic_arm64/BoardConfig.mk
View File

@ -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
# #