summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSasha Smundak <asmundak@google.com>2019-01-11 21:05:04 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-01-11 21:05:04 -0800
commitab384374a85ee85d9b879852c135a7e185c450f9 (patch)
tree58b6c72c6de902c3a78df697c1be582b4772241c
parent1ef52265bb49d970cc8b859109e7423bcc0c866d (diff)
parentd4e8d90147f7da3a608c16951e132c7f183b18de (diff)
downloadTerminal-ab384374a85ee85d9b879852c135a7e185c450f9.tar.gz
Convert Android.mk file to Android.bp am: 282fff0d96 am: 206687fa28
am: d4e8d90147 Change-Id: I4ccb2504b6adc635a03ba27341c53be058601f8b
-rw-r--r--Android.bp12
-rw-r--r--Android.mk23
2 files changed, 12 insertions, 23 deletions
diff --git a/Android.bp b/Android.bp
index 726a790..d43a37b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,3 +1,15 @@
subdirs = [
"jni",
]
+android_app {
+ name: "Terminal",
+ srcs: ["**/*.java"],
+ static_libs: ["androidx.viewpager_viewpager"],
+ jni_libs: ["libjni_terminal"],
+ // TODO: enable proguard once development has settled down
+ //LOCAL_PROGUARD_FLAG_FILES := proguard.flags
+ optimize: {
+ enabled: false,
+ },
+ platform_apis: true,
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 7998a2f..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_USE_AAPT2 := true
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-
-LOCAL_STATIC_ANDROID_LIBRARIES := androidx.viewpager_viewpager
-
-LOCAL_JNI_SHARED_LIBRARIES := libjni_terminal
-
-# TODO: enable proguard once development has settled down
-#LOCAL_PROGUARD_FLAG_FILES := proguard.flags
-LOCAL_PROGUARD_ENABLED := disabled
-
-LOCAL_PACKAGE_NAME := Terminal
-LOCAL_PRIVATE_PLATFORM_APIS := true
-
-include $(BUILD_PACKAGE)
-
-include $(call all-makefiles-under,$(LOCAL_PATH))