diff options
| author | Sasha Smundak <asmundak@google.com> | 2019-01-11 20:56:52 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-01-11 20:56:52 -0800 |
| commit | 206687fa28a9266ba4f099de59b608764fdc4993 (patch) | |
| tree | 58b6c72c6de902c3a78df697c1be582b4772241c | |
| parent | 1466569f97eabc71dc6321a29a9d08aa142c0bd6 (diff) | |
| parent | 282fff0d96164ce61a43b22dcbe24fd0ee7ed0e8 (diff) | |
| download | Terminal-206687fa28a9266ba4f099de59b608764fdc4993.tar.gz | |
Convert Android.mk file to Android.bp
am: 282fff0d96
Change-Id: I19654c80014f5dc6254a9c9bd5324105b075403e
| -rw-r--r-- | Android.bp | 12 | ||||
| -rw-r--r-- | Android.mk | 23 |
2 files changed, 12 insertions, 23 deletions
@@ -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)) |