diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2019-01-15 22:30:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-01-15 22:30:21 +0000 |
| commit | 4e06707a716feb421e94de475f4d52e3b98f6bea (patch) | |
| tree | f0e411c6d18d77c327031ff9e5d406231ddd4203 | |
| parent | 49f3624a6d3307b640a012f15b94d04174473501 (diff) | |
| parent | 786a1f9867f822e8af4fd81b3e60eff843b6f34f (diff) | |
| download | oauth-4e06707a716feb421e94de475f4d52e3b98f6bea.tar.gz | |
Merge "Convert Android.mk file to Android.bp"android-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10oreo-mr1-iot-release
| -rw-r--r-- | core/src/main/java/Android.bp | 6 | ||||
| -rw-r--r-- | core/src/main/java/Android.mk | 14 |
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) |