summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2019-01-10 04:02:32 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2019-01-10 04:02:32 +0000
commit14c6d3b6cad75fa9e7b9ddd5560f01cb9639cd03 (patch)
tree9bf85014246b9073fcd1b0b6d557cb8a57367b48
parent9d322745b8c93e4cabb3de76b6505fa201fc036b (diff)
parentca909ec21899b2cc2d44e771c601a03ceb97e989 (diff)
downloadandroid_packages_screensavers_PhotoTable-14c6d3b6cad75fa9e7b9ddd5560f01cb9639cd03.tar.gz
android_packages_screensavers_PhotoTable-14c6d3b6cad75fa9e7b9ddd5560f01cb9639cd03.tar.bz2
android_packages_screensavers_PhotoTable-14c6d3b6cad75fa9e7b9ddd5560f01cb9639cd03.zip
Snap for 5220519 from ca909ec21899b2cc2d44e771c601a03ceb97e989 to qt-release
Change-Id: I82df0fa0a650f0597a3b4a5048dec92d87e42954
-rw-r--r--Android.bp6
-rw-r--r--Android.mk16
2 files changed, 6 insertions, 16 deletions
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..4d3de00
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,6 @@
+android_app {
+ name: "PhotoTable",
+ // Only compile source java files in this apk.
+ srcs: ["src/**/*.java"],
+ sdk_version: "current",
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index e2f2f3a..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,16 +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 := PhotoTable
-
-LOCAL_SDK_VERSION := current
-
-include $(BUILD_PACKAGE)
-
-# Use the following include to make our test apk.
-include $(call all-makefiles-under,$(LOCAL_PATH))