summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSasha Smundak <asmundak@google.com>2019-01-11 19:45:19 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-01-11 19:45:19 -0800
commitcb228be07017b413d2db27f25589bfd80a17dd1a (patch)
tree49ce9a6eae715e520a49a8b92ad488385c708eb9
parent0617ba3bbb94b76e350f2ad7f9f96d35eea9f179 (diff)
parent7a336bcdd66f5067f9616c8a6b45a400f34d7e2e (diff)
downloadplatform_packages_apps_Provision-cb228be07017b413d2db27f25589bfd80a17dd1a.tar.gz
platform_packages_apps_Provision-cb228be07017b413d2db27f25589bfd80a17dd1a.tar.bz2
platform_packages_apps_Provision-cb228be07017b413d2db27f25589bfd80a17dd1a.zip
Merge "Convert Android.mk file to Android.bp" am: 93068a3c58
am: 7a336bcdd6 Change-Id: If5e063787debf0361732489375b194b4c9a082a8
-rw-r--r--Android.bp10
-rw-r--r--Android.mk15
2 files changed, 10 insertions, 15 deletions
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..15377f0
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,10 @@
+android_app {
+ name: "Provision",
+ srcs: ["**/*.java"],
+ platform_apis: true,
+ certificate: "platform",
+ privileged: true,
+ optimize: {
+ proguard_flags_files: ["proguard.flags"],
+ },
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 9737a29..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-
-LOCAL_PACKAGE_NAME := Provision
-LOCAL_PRIVATE_PLATFORM_APIS := true
-LOCAL_CERTIFICATE := platform
-LOCAL_PRIVILEGED_MODULE := true
-
-LOCAL_PROGUARD_FLAG_FILES := proguard.flags
-
-include $(BUILD_PACKAGE)