Extract dexlib2 as a separate host libraryandroid-wear-5.0.0_r1android-l-preview_r2android-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-cts-5.1_r1android-cts-5.0_r9android-cts-5.0_r8android-cts-5.0_r7android-cts-5.0_r6android-cts-5.0_r5android-cts-5.0_r4android-cts-5.0_r3android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r5android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r28android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r22android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r17android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r12android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1android-5.0.2_r3android-5.0.2_r1android-5.0.1_r1android-5.0.0_r7android-5.0.0_r6android-5.0.0_r5.1android-5.0.0_r5android-5.0.0_r4android-5.0.0_r3android-5.0.0_r2android-5.0.0_r1lollipop-wear-releaselollipop-releaselollipop-mr1-wfc-releaselollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-devlollipop-mr1-cts-releaselollipop-devlollipop-cts-releasel-previewidea133-weekly-release

Change-Id: Iae608e6b6f17e69096ec9f6154f38b579474d650

3 files changed, 41 insertions, 8 deletions

diff --git a/baksmali/Android.mk b/baksmali/Android.mk
index 9b54c81b..9ef29675 100644
--- a/baksmali/Android.mk
+++ b/baksmali/Android.mk
@@ -31,15 +31,12 @@ intermediates := $(call local-intermediates-dir,COMMON)
 
 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 00000000..437ee377
--- /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 5e334655..7f6aac7a 100644
--- a/smali/Android.mk
+++ b/smali/Android.mk
@@ -36,16 +36,13 @@ GEN := $(addprefix $(intermediates)/, \
 
 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 | \