diff options
| author | Sasha Smundak <asmundak@google.com> | 2019-01-09 11:45:53 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-01-09 11:45:53 -0800 |
| commit | 2f9f55a35e92cb7d6c185a81091e2f89d1bbcca7 (patch) | |
| tree | 006e6312c1fc766ec447fdd7925d738a4c989bef | |
| parent | 183ba610453c1de48a34dc38bbe671c827dcaa57 (diff) | |
| parent | 88335a925b34b97a588b322080d14b0b05831a17 (diff) | |
| download | android_packages_screensavers_PhotoTable-2f9f55a35e92cb7d6c185a81091e2f89d1bbcca7.tar.gz android_packages_screensavers_PhotoTable-2f9f55a35e92cb7d6c185a81091e2f89d1bbcca7.tar.bz2 android_packages_screensavers_PhotoTable-2f9f55a35e92cb7d6c185a81091e2f89d1bbcca7.zip | |
Merge "Convert Android.mk file to Android.bp" am: f0e7d90f18
am: 88335a925b
Change-Id: I563f871793a4fdf77e9affb7edac57a8affbdd77
| -rw-r--r-- | Android.bp | 6 | ||||
| -rw-r--r-- | Android.mk | 16 |
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)) |