Snap for 4422293 from cbfad5619138abefd2a304dd537cc4ed4ad2b7a1 to pi-release
Change-Id: I9ee0b8c36dbfdb7edf814e8152f64872ac6d8663
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..169767d
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,20 @@
+// Copyright (C) 2010 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: "jsilver",
+ srcs: ["src/**/*.java"],
+ libs: ["guava"],
+ java_resource_dirs: ["src"],
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index ce1ab5c..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright (C) 2010 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)
-
-LOCAL_SRC_FILES := \
- $(call all-java-files-under, src)
-
-LOCAL_MODULE := jsilver
-
-LOCAL_JAVA_LIBRARIES := guavalib
-LOCAL_JAVA_RESOURCE_DIRS := src
-
-include $(BUILD_HOST_JAVA_LIBRARY)
