commit 9077dffd8e819a908c360f1799c87941e9623039
author Colin Cross <ccross@android.com> Wed Oct 18 22:06:22 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 18 22:06:22 2017 +0000
tree 2935068249bfa2fd9dff36e6a8843b37ea976e1d
parent a494e0736c1e97daf2e9d1df982efdb3bb8adca0
parent 9bd6773a12576bae593008f82ff930a22e949b74

Merge "Compile dexmaker-tests"

Android.mk

diff --git a/Android.mk b/Android.mk
index e7645ef..fc13fa2 100644
--- a/Android.mk
+++ b/Android.mk
@@ -46,3 +46,5 @@
     dexmaker-dex-target:lib/libcore-dex-2$(COMMON_JAVA_PACKAGE_SUFFIX) \
 
 include $(BUILD_MULTI_PREBUILT)
+
+include $(call all-makefiles-under, $(LOCAL_PATH))

dexmaker-tests/Android.mk

diff --git a/dexmaker-tests/Android.mk b/dexmaker-tests/Android.mk
index c05d208..ff8b050 100644
--- a/dexmaker-tests/Android.mk
+++ b/dexmaker-tests/Android.mk
@@ -19,13 +19,13 @@
 # Build Dexmaker's tests
 #
 # Run the tests as follows:
-#   vogar --classpath ${ANDROID_PRODUCT_OUT}/obj/JAVA_LIBRARIES/dexmaker-tests_intermediates/classes.jack \
-        com.google.dexmaker
+#   vogar --classpath ${ANDROID_PRODUCT_OUT}/obj/JAVA_LIBRARIES/dexmaker-tests_intermediates/javalib.jar \
+        com.android.dx
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := dexmaker-tests
-LOCAL_SDK_VERSION := 10
-LOCAL_SRC_FILES := $(call all-java-files-under, dexmaker-tests/src/androidTest/java)
+LOCAL_SDK_VERSION := 17
+LOCAL_SRC_FILES := $(call all-java-files-under, src/androidTest/java)
 LOCAL_STATIC_JAVA_LIBRARIES := dexmaker android-support-test
 include $(BUILD_STATIC_JAVA_LIBRARY)