summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSasha Smundak <asmundak@google.com>2019-01-15 15:06:46 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-01-15 15:06:46 -0800
commit90ad95da1e48f40634e5a7a09c8dd0c26f673c99 (patch)
treef0e411c6d18d77c327031ff9e5d406231ddd4203
parent49f3624a6d3307b640a012f15b94d04174473501 (diff)
parent224ed806295519e60d60f2d5e45f58e434958242 (diff)
downloadoauth-90ad95da1e48f40634e5a7a09c8dd0c26f673c99.tar.gz
Merge "Convert Android.mk file to Android.bp" am: 4e06707a71
am: 224ed80629 Change-Id: I074f90b148b8c84b5b38fc9a39b28b72f8f44a39
-rw-r--r--core/src/main/java/Android.bp6
-rw-r--r--core/src/main/java/Android.mk14
2 files changed, 6 insertions, 14 deletions
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)