summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSasha Smundak <asmundak@google.com>2019-01-09 10:16:12 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-01-09 10:16:12 -0800
commit8bb1ebde1b0abee0688ef695d3bfcbffd4bb637b (patch)
tree83579290c12daedf586c30539c218042338c4a07
parentc7a88ddaa77588f321b857fbc36261e1ab595e02 (diff)
parent10d953e9e6d1f33d37ce6801d6dcd2946f00821e (diff)
downloadandroid_packages_screensavers_Basic-8bb1ebde1b0abee0688ef695d3bfcbffd4bb637b.tar.gz
android_packages_screensavers_Basic-8bb1ebde1b0abee0688ef695d3bfcbffd4bb637b.tar.bz2
android_packages_screensavers_Basic-8bb1ebde1b0abee0688ef695d3bfcbffd4bb637b.zip
Merge "Convert Android.mk file to Android.bp" am: 7c18b9609f
am: 10d953e9e6 Change-Id: I150cf4741128ab06e672f02207618946aaebd7cd
-rw-r--r--Android.bp6
-rw-r--r--Android.mk18
2 files changed, 6 insertions, 18 deletions
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..c9a65a8
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,6 @@
+android_app {
+ name: "BasicDreams",
+ // Only compile source java files in this apk.
+ srcs: ["src/**/*.java"],
+ platform_apis: true,
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 59d54fb..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-# Only compile source java files in this apk.
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := BasicDreams
-LOCAL_PRIVATE_PLATFORM_APIS := true
-
-# need tasty bits
-# LOCAL_CERTIFICATE := platform
-
-include $(BUILD_PACKAGE)
-
-# Use the following include to make our test apk.
-include $(call all-makefiles-under,$(LOCAL_PATH))