diff options
| author | Yohann Roussel <yroussel@google.com> | 2014-10-14 16:40:48 +0200 |
|---|---|---|
| committer | Yohann Roussel <yroussel@google.com> | 2014-10-24 08:20:04 +0000 |
| commit | 423baa8c7c8b0d789576e852b9d5e3c6fdfd7772 (patch) | |
| tree | 0da9015a744d7a6d1c9983e4448d218234abc69c /jack-tests/tests/com/android/jack/jarjar | |
| parent | ada9fe075543be3c4197478328001f1d44219bc8 (diff) | |
| download | toolchain_jack-423baa8c7c8b0d789576e852b9d5e3c6fdfd7772.zip toolchain_jack-423baa8c7c8b0d789576e852b9d5e3c6fdfd7772.tar.gz toolchain_jack-423baa8c7c8b0d789576e852b9d5e3c6fdfd7772.tar.bz2 | |
Adapt jack tests build rule to build system
Change-Id: I184c70f79d1410bcd1b66be3cef60815ec995659
Diffstat (limited to 'jack-tests/tests/com/android/jack/jarjar')
| -rw-r--r-- | jack-tests/tests/com/android/jack/jarjar/test001/test.mk | 8 | ||||
| -rw-r--r-- | jack-tests/tests/com/android/jack/jarjar/test003/test.mk | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/jack-tests/tests/com/android/jack/jarjar/test001/test.mk b/jack-tests/tests/com/android/jack/jarjar/test001/test.mk index 906960e..9ad826e 100644 --- a/jack-tests/tests/com/android/jack/jarjar/test001/test.mk +++ b/jack-tests/tests/com/android/jack/jarjar/test001/test.mk @@ -12,14 +12,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -private_path:= $(call my-dir) +LOCAL_PATH:= $(call my-dir) include $(JACK_CLEAR_VARS) JACKTEST_MODULE := jarjar/test001 -JACKTEST_ARGS := --jarjar-rules $(private_path)/jarjar-rules.txt -JACKTEST_WITHJACK_SRC := $(call all-java-files-under, $(abspath $(private_path)/jack/)) -JACKTEST_WITHDX_SRC := $(call all-java-files-under, $(abspath $(private_path)/dx/)) +JACKTEST_ARGS := --jarjar-rules $(LOCAL_PATH)/jarjar-rules.txt +JACKTEST_WITHJACK_SRC := $(call all-java-files-under, jack) +JACKTEST_WITHDX_SRC := $(call all-java-files-under, dx) JACKTEST_JUNIT := com.android.jack.$(subst /,.,$(JACKTEST_MODULE)).dx.Tests include $(JACK_RUN_TEST) diff --git a/jack-tests/tests/com/android/jack/jarjar/test003/test.mk b/jack-tests/tests/com/android/jack/jarjar/test003/test.mk index 756cea3..dca8609 100644 --- a/jack-tests/tests/com/android/jack/jarjar/test003/test.mk +++ b/jack-tests/tests/com/android/jack/jarjar/test003/test.mk @@ -12,14 +12,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -private_path:= $(call my-dir) +LOCAL_PATH:= $(call my-dir) include $(JACK_CLEAR_VARS) JACKTEST_MODULE := jarjar/test003 -JACKTEST_ARGS := --jarjar-rules $(private_path)/jarjar-rules.txt -JACKTEST_WITHJACK_SRC := $(call all-java-files-under, $(abspath $(private_path)/jack/)) -JACKTEST_WITHDX_SRC := $(call all-java-files-under, $(abspath $(private_path)/dx/)) +JACKTEST_ARGS := --jarjar-rules $(LOCAL_PATH)/jarjar-rules.txt +JACKTEST_WITHJACK_SRC := $(call all-java-files-under, jack) +JACKTEST_WITHDX_SRC := $(call all-java-files-under, dx) JACKTEST_JUNIT := com.android.jack.$(subst /,.,$(JACKTEST_MODULE)).dx.Tests include $(JACK_RUN_TEST) |