diff options
author | Sasha Smundak <asmundak@google.com> | 2019-01-11 20:35:54 -0800 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-01-11 20:35:54 -0800 |
commit | 54fe246a002ba8d044754f28484e78b96db3632d (patch) | |
tree | 36bfb650d3335f913200d82487f218327e374f99 | |
parent | 1e5d8a500dce6530a99cb952681889042dcfb63a (diff) | |
parent | 6cba44e3cac333a20446c12fd5f5a4a57792652d (diff) | |
download | Protips-54fe246a002ba8d044754f28484e78b96db3632d.tar.gz |
Merge "Convert Android.mk file to Android.bp" am: c6ef1d2dc0 am: fb9b1617d6
am: 6cba44e3ca
Change-Id: I4c76dc88bdcc24f4ff9129056b8c18a891d7f436
-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..b0b543a --- /dev/null +++ b/Android.bp @@ -0,0 +1,6 @@ +android_app { + name: "Protips", + // 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 467634d..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 := Protips - -LOCAL_SDK_VERSION := current - -include $(BUILD_PACKAGE) - -# Use the following include to make our test apk. -include $(call all-makefiles-under,$(LOCAL_PATH)) |