Merge "Convert external/dexmaker to Android.bp"
am: a3bc7e013a

Change-Id: Ibab92be5a0f29723a3b56e5d00ef2572ea51e896
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..8b0cc40
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,49 @@
+// Copyright (C) 2011 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.
+
+java_library_static {
+    name: "dexmaker",
+
+    // Include all the java files.
+    srcs: ["dexmaker/src/main/java/**/*.java"],
+
+    static_libs: [
+        "dexmaker-dx-target",
+        "dexmaker-dex-target",
+    ],
+
+    sdk_version: "10",
+}
+
+// Build Dexmaker's MockMaker, a plugin to Mockito
+java_library_static {
+    name: "dexmaker-mockmaker",
+    sdk_version: "10",
+    srcs: ["dexmaker-mockito/src/main/java/**/*.java"],
+    java_resource_dirs: ["dexmaker-mockito/src/main/resources"],
+    libs: [
+        "dexmaker",
+        "mockito-api",
+    ],
+}
+
+java_import {
+    name: "dexmaker-dx-target",
+    jars: ["lib/dalvik-dx-1.jar"],
+}
+
+java_import {
+    name: "dexmaker-dex-target",
+    jars: ["lib/libcore-dex-2.jar"],
+}
diff --git a/Android.mk b/Android.mk
index fc13fa2..8bf81fb 100644
--- a/Android.mk
+++ b/Android.mk
@@ -13,38 +13,5 @@
 # limitations under the License.
 
 LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-# Include all the java files.
-LOCAL_SRC_FILES := $(call all-java-files-under, dexmaker/src/main/java)
-
-LOCAL_STATIC_JAVA_LIBRARIES := dexmaker-dx-target dexmaker-dex-target
-
-LOCAL_SDK_VERSION := 10
-
-# The name of the jar file to create.
-LOCAL_MODULE := dexmaker
-
-# Build a static jar file.
-include $(BUILD_STATIC_JAVA_LIBRARY)
-
-# Build Dexmaker's MockMaker, a plugin to Mockito
-include $(CLEAR_VARS)
-LOCAL_MODULE := dexmaker-mockmaker
-LOCAL_SDK_VERSION := 10
-LOCAL_SRC_FILES := $(call all-java-files-under, dexmaker-mockito/src/main/java)
-LOCAL_JAVA_RESOURCE_DIRS := dexmaker-mockito/src/main/resources
-LOCAL_JAVA_LIBRARIES := dexmaker mockito-api
-include $(BUILD_STATIC_JAVA_LIBRARY)
-
-# Target prebuilt dependencies.
-# ============================================================
-include $(CLEAR_VARS)
-
-LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := \
-    dexmaker-dx-target:lib/dalvik-dx-1$(COMMON_JAVA_PACKAGE_SUFFIX) \
-    dexmaker-dex-target:lib/libcore-dex-2$(COMMON_JAVA_PACKAGE_SUFFIX) \
-
-include $(BUILD_MULTI_PREBUILT)
 
 include $(call all-makefiles-under, $(LOCAL_PATH))