diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..f31fda1
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,29 @@
+// 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_static {
+    name: "guava",
+    host_supported: true,
+    hostdex: true,
+    sdk_version: "9",
+    srcs: ["guava/src/**/*.java"],
+    static_libs: ["jsr305"],
+    java_version: "1.7",
+}
+
+// Compatibility name for existing host modules
+java_library_host {
+    name: "guavalib",
+    static_libs: ["guava"],
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 4007150..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,43 +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_MODULE := guava
-LOCAL_SDK_VERSION := 9
-LOCAL_SRC_FILES := $(call all-java-files-under, guava/src)
-LOCAL_STATIC_JAVA_LIBRARIES := jsr305
-
-include $(BUILD_STATIC_JAVA_LIBRARY)
-
-# Also build a host-side library
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := $(call all-java-files-under, guava/src)
-LOCAL_MODULE := guavalib
-LOCAL_STATIC_JAVA_LIBRARIES := jsr305lib
-LOCAL_JAVA_LANGUAGE_VERSION := 1.7
-
-include $(BUILD_HOST_JAVA_LIBRARY)
-
-
-# Also build a host-side dalvik library
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := $(call all-java-files-under, guava/src)
-LOCAL_MODULE := guava-hostdex
-LOCAL_STATIC_JAVA_LIBRARIES := jsr305-hostdex
-
-include $(BUILD_HOST_DALVIK_STATIC_JAVA_LIBRARY)