diff options
| author | Roland Levillain <rpl@google.com> | 2015-12-08 11:23:02 +0000 |
|---|---|---|
| committer | Roland Levillain <rpl@google.com> | 2015-12-08 13:54:39 +0000 |
| commit | ca023a398f4120c3ce0792c8ab4d9bf06db167be (patch) | |
| tree | 0066f7e99a70f12212448fd7e6e42491c2ddc5e6 /Android.mk | |
| parent | e8be90a673feb573d53277f42282955cbf7f58e9 (diff) | |
| download | android_art-ca023a398f4120c3ce0792c8ab4d9bf06db167be.tar.gz android_art-ca023a398f4120c3ce0792c8ab4d9bf06db167be.tar.bz2 android_art-ca023a398f4120c3ce0792c8ab4d9bf06db167be.zip | |
Fix test-art-target-sync when ART_TEST_ANDROID_ROOT is used.
The semantics of "adb push" have changed since the time
system/core was pinned in the master-art manifest.
Bug: 26051370
Change-Id: I3ee6f2694168b0cdc8c8ac37f77fd443879275dc
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 0d0003abb0..3438beba3f 100644 --- a/Android.mk +++ b/Android.mk @@ -146,7 +146,10 @@ else test-art-target-sync: $(TEST_ART_TARGET_SYNC_DEPS) $(TEST_ART_ADB_ROOT_AND_REMOUNT) adb wait-for-device push $(ANDROID_PRODUCT_OUT)/system $(ART_TEST_ANDROID_ROOT) - adb push $(ANDROID_PRODUCT_OUT)/data /data +# Push the contents of the `data` dir into `/data` on the device. If +# `/data` already exists on the device, it is not overwritten, but its +# contents are updated. + adb push $(ANDROID_PRODUCT_OUT)/data / endif endif |