From d84b79e8011041d3497e18f72d4273d5ac150ead Mon Sep 17 00:00:00 2001
From: dianlujitao <dianlujitao@lineageos.org>
Date: Tue, 1 Feb 2022 17:13:05 +0800
Subject: [PATCH] MotoActions: Convert to Android.bp

Change-Id: I678d6bfd1058248203e8a5fb7e5720a2d2573ca2
---
 Android.mk             | 19 -------------------
 MotoActions/Android.bp | 21 +++++++++++++++++++++
 MotoActions/Android.mk | 31 -------------------------------
 3 files changed, 21 insertions(+), 50 deletions(-)
 delete mode 100644 Android.mk
 create mode 100644 MotoActions/Android.bp
 delete mode 100644 MotoActions/Android.mk

diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 9253d91..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2020 The LineageOS 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 $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/MotoActions/Android.bp b/MotoActions/Android.bp
new file mode 100644
index 0000000..1ed6c92
--- /dev/null
+++ b/MotoActions/Android.bp
@@ -0,0 +1,21 @@
+android_app {
+    name: "MotoActions",
+    defaults: ["SettingsLibDefaults"],
+
+    srcs: ["src/**/*.java"],
+    resource_dirs: ["res"],
+
+    certificate: "platform",
+    platform_apis: true,
+    system_ext_specific: true,
+
+    static_libs: [
+        "androidx.core_core",
+        "androidx.preference_preference",
+        "org.lineageos.settings.resources",
+    ],
+
+    optimize: {
+        proguard_flags_files: ["proguard.flags"],
+    },
+}
diff --git a/MotoActions/Android.mk b/MotoActions/Android.mk
deleted file mode 100644
index 2d50abc..0000000
--- a/MotoActions/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := MotoActions
-LOCAL_CERTIFICATE := platform
-LOCAL_PRIVATE_PLATFORM_APIS := true
-LOCAL_USE_AAPT2 := true
-LOCAL_SYSTEM_EXT_MODULE := true
-
-LOCAL_STATIC_ANDROID_LIBRARIES := \
-    androidx.core_core \
-    androidx.preference_preference
-
-LOCAL_PROGUARD_FLAG_FILES := proguard.flags
-
-LOCAL_RESOURCE_DIR := \
-    $(LOCAL_PATH)/res \
-    $(TOP)/packages/resources/devicesettings/res
-
-ifneq ($(INCREMENTAL_BUILDS),)
-    LOCAL_PROGUARD_ENABLED := disabled
-    LOCAL_JACK_ENABLED := incremental
-endif
-
-include frameworks/base/packages/SettingsLib/common.mk
-
-include $(BUILD_PACKAGE)
-- 
2.20.1