Remove build target `test-art-target-sync`.
This build target is essentially dead code, as we have been relying on
the `tools/buildbot-sync.sh` script to sync build products to the
device for some time now.
Note that this build target has been broken since Android builds
became sandboxed and disallowed the execution of `adb`.
Test: Rely on the Android Build and the ART Buildbot
Bug: 111676396
Change-Id: Ib28aa6c24eed892605c7bac1bccbcbe8d72ac12b
diff --git a/Android.mk b/Android.mk
index fc44da4..27f8ed5 100644
--- a/Android.mk
+++ b/Android.mk
@@ -97,40 +97,6 @@
$(ADB) wait-for-device root && \
$(ADB) wait-for-device remount)))
-# Sync test files to the target, depends upon all things that must be pushed to the target.
-.PHONY: test-art-target-sync
-# Check if we need to sync. In case ART_TEST_CHROOT or ART_TEST_ANDROID_ROOT
-# is not empty, the code below uses 'adb push' instead of 'adb sync',
-# which does not check if the files on the device have changed.
-# TODO: Remove support for ART_TEST_ANDROID_ROOT when it is no longer needed.
-ifneq ($(ART_TEST_NO_SYNC),true)
-# Sync system and data partitions.
-ifeq ($(ART_TEST_ANDROID_ROOT),)
-ifeq ($(ART_TEST_CHROOT),)
-test-art-target-sync: $(TEST_ART_TARGET_SYNC_DEPS)
- $(TEST_ART_ADB_ROOT_AND_REMOUNT)
- $(ADB) sync system && $(ADB) sync data
-else
-# TEST_ART_ADB_ROOT_AND_REMOUNT is not needed here, as we are only
-# pushing things to the chroot dir, which is expected to be under
-# /data on the device.
-test-art-target-sync: $(TEST_ART_TARGET_SYNC_DEPS)
- $(ADB) wait-for-device
- $(ADB) push $(PRODUCT_OUT)/system $(ART_TEST_CHROOT)/
- $(ADB) push $(PRODUCT_OUT)/data $(ART_TEST_CHROOT)/
-endif
-else
-test-art-target-sync: $(TEST_ART_TARGET_SYNC_DEPS)
- $(TEST_ART_ADB_ROOT_AND_REMOUNT)
- $(ADB) wait-for-device
- $(ADB) push $(PRODUCT_OUT)/system $(ART_TEST_CHROOT)$(ART_TEST_ANDROID_ROOT)
-# Push the contents of the `data` dir into `$(ART_TEST_CHROOT)/data` on the device (note
-# that $(ART_TEST_CHROOT) can be empty). If `$(ART_TEST_CHROOT)/data` already exists on
-# the device, it is not overwritten, but its content is updated.
- $(ADB) push $(PRODUCT_OUT)/data $(ART_TEST_CHROOT)/
-endif
-endif
-
# "mm test-art" to build and run all tests on host and device
.PHONY: test-art
test-art: test-art-host test-art-target
diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk
index 57a428f..c4e07d3 100644
--- a/test/Android.run-test.mk
+++ b/test/Android.run-test.mk
@@ -103,10 +103,6 @@
# Required for jasmin and smali.
host_prereq_rules += $(TEST_ART_RUN_TEST_DEPENDENCIES)
-# Sync test files to the target, depends upon all things that must be pushed
-#to the target.
-target_prereq_rules += test-art-target-sync
-
define core-image-dependencies
image_suffix := $(3)
ifeq ($(3),regalloc_gc)
@@ -144,7 +140,7 @@
test-art-host-run-test-dependencies : $(host_prereq_rules)
.PHONY: test-art-host-run-test-dependencies
-test-art-target-run-test-dependencies : $(target_prereq_rules)
+test-art-target-run-test-dependencies :
.PHONY: test-art-target-run-test-dependencies
test-art-run-test-dependencies : test-art-host-run-test-dependencies test-art-target-run-test-dependencies
.PHONY: test-art-run-test-dependencies
@@ -168,7 +164,6 @@
test-art-run-test : test-art-host-run-test test-art-target-run-test
host_prereq_rules :=
-target_prereq_rules :=
core-image-dependencies :=
define-test-art-host-or-target-run-test-group :=
TARGET_TYPES :=