diff options
| author | 2017-12-31 16:39:25 +0000 | |
|---|---|---|
| committer | 2017-12-31 16:39:25 +0000 | |
| commit | a13628ed118c821eef5e2eaf76a9b17ac27a405f (patch) | |
| tree | e29332aad50d0cea7d55f443ddf5dfe0d39e5d63 | |
| parent | 66c04886268e1ee537b075dd04c8648a06321f39 (diff) | |
| parent | a022d8bf3a4a39f99a2c4498fde75ce1a6fc585f (diff) | |
Merge "Use PRODUCT_OUT instead of ANDROID_PRODUCT_OUT"
| -rw-r--r-- | Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk index cb0b709107..0a90a0bb24 100644 --- a/Android.mk +++ b/Android.mk @@ -135,11 +135,11 @@ test-art-target-sync: $(TEST_ART_TARGET_SYNC_DEPS) 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 wait-for-device push $(PRODUCT_OUT)/system $(ART_TEST_ANDROID_ROOT) # 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 / + adb push $(PRODUCT_OUT)/data / endif endif |