diff --git a/baksmali/Android.mk b/baksmali/Android.mk
index 9b54c81..9ef2967 100644
--- a/baksmali/Android.mk
+++ b/baksmali/Android.mk
@@ -31,15 +31,12 @@
 
 LOCAL_SRC_FILES := \
 	$(call all-java-files-under, src/main/java) \
-	$(call all-java-files-under, ../dexlib2/src/main/java) \
 	$(call all-java-files-under, ../util/src/main/java)
 
 LOCAL_JAR_MANIFEST := manifest.txt
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
-	antlr-runtime \
-	commons-cli-1.2 \
-	guavalib
+	dexlib2
 
 #read in the version number
 BAKSMALI_VERSION := $(shell cat $(LOCAL_PATH)/../build.gradle | \
diff --git a/dexlib2/Android.mk b/dexlib2/Android.mk
new file mode 100644
index 0000000..437ee37
--- /dev/null
+++ b/dexlib2/Android.mk
@@ -0,0 +1,39 @@
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+LOCAL_PATH := $(call my-dir)
+
+# build dexlib2 jar
+# ============================================================
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := dexlib2
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+LOCAL_IS_HOST_MODULE := true
+
+LOCAL_SRC_FILES := \
+	$(call all-java-files-under, src/main/java) \
+	$(call all-java-files-under, ../util/src/main/java)
+
+LOCAL_STATIC_JAVA_LIBRARIES := \
+	commons-cli-1.2 \
+	guavalib \
+	jsr305lib
+
+
+include $(BUILD_HOST_JAVA_LIBRARY)
\ No newline at end of file
diff --git a/smali/Android.mk b/smali/Android.mk
index 5e33465..7f6aac7 100644
--- a/smali/Android.mk
+++ b/smali/Android.mk
@@ -36,16 +36,13 @@
 
 LOCAL_SRC_FILES := \
 	$(call all-java-files-under, src/main/java) \
-	$(call all-java-files-under, ../dexlib2/src/main/java) \
 	$(call all-java-files-under, ../util/src/main/java)
 
 LOCAL_JAR_MANIFEST := manifest.txt
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
 	antlr-runtime \
-	commons-cli-1.2 \
-	guavalib \
-	jsr305lib
+	dexlib2
 
 #read in the version number
 SMALI_VERSION := $(shell cat $(LOCAL_PATH)/../build.gradle | \