| commit | 64c2d77138f65bb7fae00aa8802055062c368fd9 | [log] [tgz] |
|---|---|---|
| author | Nicolas Geoffray <ngeoffray@google.com> | Fri Aug 31 09:22:44 2018 +0100 |
| committer | Nicolas Geoffray <ngeoffray@google.com> | Fri Aug 31 10:14:07 2018 +0100 |
| tree | 408d916a5888cc64acc93ee13b7cc0e017656e3c | |
| parent | 4a25727eba333c19dc6eacc35950c526c11041d4 [diff] [blame] |
Define $(ADB) in ART makefiles instead of hard-coding adb. Follow-up after restrictions put in place by the build, see: https://android.googlesource.com/platform/build/+/master/Changes.md#PATH_Tools Test: test-art-target-sync, test-art-target-gtest Change-Id: Ibd01be9c348ef1cc24d53d0d4c30c64eb1d9eac7
diff --git a/build/Android.common.mk b/build/Android.common.mk index a6a9f0f..316ce64 100644 --- a/build/Android.common.mk +++ b/build/Android.common.mk
@@ -92,4 +92,7 @@ 2ND_ART_HOST_OUT_SHARED_LIBRARIES := $(2ND_HOST_OUT_SHARED_LIBRARIES) endif +ADB_EXECUTABLE := $(HOST_OUT_EXECUTABLES)/adb +ADB := $(ADB_EXECUTABLE) + endif # ART_ANDROID_COMMON_MK