Convert jarjar to Android.bp am: 2acaac5c90

am: 9ccadaf655

Change-Id: I0fccb2b995f76b4605c14b3709ed64c5db48f5cb

2 files changed, 43 insertions, 50 deletions

diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..7136444
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,43 @@
+// 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.
+
+java_library_host {
+    name: "jarjar",
+    manifest: "manifest.txt",
+
+    srcs: ["src/main/**/*.java"],
+    java_resource_dirs: ["res"],
+
+    static_libs: [
+        "asm-5.2",
+        "asm-commons-5.2",
+    ],
+
+    libs: [
+        "jarjar-maven-plugin-api",
+        "jarjar-apache-ant",
+    ],
+}
+
+//#################################################
+
+java_import_host {
+    name: "jarjar-maven-plugin-api",
+    jars: ["lib/maven-plugin-api.jar"],
+}
+
+java_import_host {
+    name: "jarjar-apache-ant",
+    jars: ["lib/apache-ant-1.9.4.jar"],
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 7b3427b..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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)
-include $(CLEAR_VARS)
-
-ifeq ($(wildcard prebuilts/misc/common/jarjar),)
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src/main)
-
-LOCAL_STATIC_JAVA_LIBRARIES := \
-    asm-5.2 \
-    asm-commons-5.2 \
-
-LOCAL_JAVA_LIBRARIES := \
-    jarjar-maven-plugin-api \
-    jarjar-apache-ant
-
-LOCAL_MODULE := jarjar
-LOCAL_MODULE_TAGS := optional
-LOCAL_JAR_MANIFEST := manifest.txt
-LOCAL_JAVA_RESOURCE_DIRS := res
-
-include $(BUILD_HOST_JAVA_LIBRARY)
-
-##################################################
-include $(CLEAR_VARS)
-
-LOCAL_PREBUILT_JAVA_LIBRARIES := \
-    jarjar-asm:lib/asm-4.0$(COMMON_JAVA_PACKAGE_SUFFIX) \
-    jarjar-asm-commons:lib/asm-commons-4.0$(COMMON_JAVA_PACKAGE_SUFFIX) \
-    jarjar-maven-plugin-api:lib/maven-plugin-api$(COMMON_JAVA_PACKAGE_SUFFIX) \
-    jarjar-apache-ant:lib/apache-ant-1.9.4$(COMMON_JAVA_PACKAGE_SUFFIX)
-
-LOCAL_MODULE_TAGS := optional
-
-include $(BUILD_HOST_PREBUILT)
-
-endif