Merge "Convert Android.mk file to Android.bp"
diff --git a/core/src/main/java/Android.bp b/core/src/main/java/Android.bp
new file mode 100644
index 0000000..412ca6e
--- /dev/null
+++ b/core/src/main/java/Android.bp
@@ -0,0 +1,6 @@
+// Build the client static library for the Google Services Framework
+java_library {
+ name: "oauth",
+ srcs: ["net/**/*.java"],
+ sdk_version: "8",
+}
diff --git a/core/src/main/java/Android.mk b/core/src/main/java/Android.mk
deleted file mode 100644
index 109698f..0000000
--- a/core/src/main/java/Android.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-# This will build the client static library for the Google Services Framework
-LOCAL_MODULE := oauth
-
-# Includes all the java files, and explicitly declares any aidl files
-LOCAL_SRC_FILES := \
- $(call all-java-files-under, net)
-
-LOCAL_SDK_VERSION := 8
-
-# Build the actual static library
-include $(BUILD_STATIC_JAVA_LIBRARY)
