diff options
| author | Roland Levillain <rpl@google.com> | 2018-08-03 14:06:21 +0100 |
|---|---|---|
| committer | Roland Levillain <rpl@google.com> | 2018-08-03 14:06:21 +0100 |
| commit | 5798195d03eb6928bac3aa7d991ffed5af84278f (patch) | |
| tree | 6d5fd7e59689c30e98f80dea4b438eff19bb9cf1 /Android.mk | |
| parent | 359db87557da7cd5ae4ea75b07ef54b2173707c7 (diff) | |
| download | art-5798195d03eb6928bac3aa7d991ffed5af84278f.tar.gz art-5798195d03eb6928bac3aa7d991ffed5af84278f.tar.bz2 art-5798195d03eb6928bac3aa7d991ffed5af84278f.zip | |
Don't try to make /system on device writable when syncing ART to chroot dir.
When using a chroot dir for ART testing, we are only pushing files to
directory $ART_TEST_CHROOT (which is expected to be under /data on the
device) -- /system is left untouched, which means we do not need to
try and make it writable before syncing ART to the device for testing
purposes.
Note that skipping this step is especially useful in the case of
chroot-based testing, as making /system writable requires a reboot on
most devices nowadays (it's needed after running
`adb disable-verity`), whichs resets some of the chroot setup (and
thus requires running the chroot setup script again).
Test: Rely on the ART Buildbot
Bug: 34729697
Change-Id: Id4e4ad93a888a1180c0502e541b9497cfa58d211
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk index 1c946292ef..19c65a1e67 100644 --- a/Android.mk +++ b/Android.mk @@ -98,6 +98,7 @@ include $(art_path)/build/Android.common_test.mk include $(art_path)/build/Android.gtest.mk include $(art_path)/test/Android.run-test.mk +# Make sure /system is writable on the device. TEST_ART_ADB_ROOT_AND_REMOUNT := \ (adb root && \ adb wait-for-device remount && \ @@ -122,8 +123,10 @@ 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) - $(TEST_ART_ADB_ROOT_AND_REMOUNT) adb wait-for-device adb push $(PRODUCT_OUT)/system $(ART_TEST_CHROOT)/ adb push $(PRODUCT_OUT)/data $(ART_TEST_CHROOT)/ |