Snap for 6182732 from 28704bea251866d1438d60b59dcf090f446ffdc6 to rvc-release

Change-Id: I2f6d3e61e6e9c6cd90141c89351c43335e25295d
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..83464fa
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,26 @@
+// 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.
+
+// Build dependencies.
+// ============================================================
+
+java_import_host {
+    name: "vogar-jsr305",
+    jars: ["lib/jsr305.jar"],
+}
+
+java_import_host {
+    name: "vogar-kxml-libcore-20110123",
+    jars: ["lib/kxml-libcore-20110123.jar"],
+}
diff --git a/Android.mk b/Android.mk
index 2eab8eb..b0dbc16 100644
--- a/Android.mk
+++ b/Android.mk
@@ -67,16 +67,6 @@
 
 include $(BUILD_HOST_JAVA_LIBRARY)
 
-# Build dependencies.
-# ============================================================
-include $(CLEAR_VARS)
-
-LOCAL_PREBUILT_JAVA_LIBRARIES := \
-    vogar-jsr305:lib/jsr305$(COMMON_JAVA_PACKAGE_SUFFIX) \
-    vogar-kxml-libcore-20110123:lib/kxml-libcore-20110123$(COMMON_JAVA_PACKAGE_SUFFIX)
-
-include $(BUILD_HOST_PREBUILT)
-
 # copy vogar script
 # ============================================================
 include $(CLEAR_VARS)