Merge "Convert Android.mk file to Android.bp"
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..4164c0e
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,44 @@
+//
+// Copyright (C) 2009 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+prebuilt_etc {
+ name: "android.software.live_wallpaper.xml",
+ sub_dir: "permissions",
+ src: "android.software.live_wallpaper.xml",
+}
+
+android_app {
+ name: "LiveWallpapersPicker",
+ srcs: ["**/*.java"],
+ required: ["android.software.live_wallpaper.xml"],
+ platform_apis: true,
+ certificate: "platform",
+ optimize: {
+ proguard_flags_files: ["proguard.flags"],
+ },
+ static_libs: [
+ "android-support-annotations",
+ "android-support-v7-appcompat",
+ "android-support-compat",
+ "android-support-core-utils",
+ "android-support-core-ui",
+ "android-support-fragment",
+ "android-support-design",
+ "android-support-transition",
+ "android-support-v7-recyclerview",
+ ],
+ resource_dirs: ["res"],
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 507dd8e..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-# Copyright (C) 2009 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-########################
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := android.software.live_wallpaper.xml
-
-LOCAL_MODULE_CLASS := ETC
-
-LOCAL_MODULE_TAGS := optional
-
-# This will install the file in /system/etc/permissions
-#
-LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/permissions
-
-LOCAL_SRC_FILES := $(LOCAL_MODULE)
-
-include $(BUILD_PREBUILT)
-
-########################
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_REQUIRED_MODULES := android.software.live_wallpaper.xml
-
-LOCAL_PACKAGE_NAME := LiveWallpapersPicker
-LOCAL_PRIVATE_PLATFORM_APIS := true
-LOCAL_CERTIFICATE := platform
-
-LOCAL_PROGUARD_FLAG_FILES := proguard.flags
-
-LOCAL_STATIC_JAVA_LIBRARIES := \
- android-support-annotations
-
-LOCAL_STATIC_ANDROID_LIBRARIES := \
- android-support-v7-appcompat \
- android-support-compat \
- android-support-core-utils \
- android-support-core-ui \
- android-support-fragment \
- $(ANDROID_SUPPORT_DESIGN_TARGETS) \
- android-support-transition \
- android-support-v7-recyclerview
-
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-LOCAL_USE_AAPT2 := true
-
-include $(BUILD_PACKAGE)
