commit 2c89906432d3fa9675ff6824a8401eae50610cb1
author Treehugger Robot <treehugger-gerrit@google.com> Sat Jan 12 02:44:48 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Jan 12 02:44:48 2019 +0000
tree 7fca5a52e10e6bf2316ad51e52fc69fbe0666113
parent 89bcf1519ab956f681a1a713aff4bd77a881e623
parent 78f05725e5c94d9f0efe0954b3ccbdf50979c620

Merge "Convert Android.mk file to Android.bp"

Android.bp

diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..11aa25d
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,8 @@
+android_app {
+    name: "Music",
+    srcs: ["src/**/*.java"],
+    sdk_version: "current",
+    optimize: {
+        proguard_flags_files: ["proguard.flags"],
+    },
+}

Android.mk

diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 3e620f3..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := Music
-
-LOCAL_SDK_VERSION := current
-
-LOCAL_PROGUARD_FLAG_FILES := proguard.flags
-
-include $(BUILD_PACKAGE)
-
-# Use the folloing include to make our test apk.
-include $(call all-makefiles-under,$(LOCAL_PATH))