lineage-sdk: Android.mk -> Android.bp

Change-Id: Iac2bd318e7ceb6b96e30d26832d98b7b2726cd5b

4 files changed, 65 insertions, 64 deletions

diff --git a/packages/LineageSettingsProvider/Android.bp b/packages/LineageSettingsProvider/Android.bp
new file mode 100644
index 00000000..3b9d3e62
--- /dev/null
+++ b/packages/LineageSettingsProvider/Android.bp
@@ -0,0 +1,33 @@
+//
+// Copyright (C) 2018 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.
+//
+
+android_app {
+    srcs: ["src/**/*.java"],
+    resource_dirs: ["res"],
+
+    name: "LineageSettingsProvider",
+    certificate: "platform",
+    privileged: true,
+
+    static_libs: [
+        "android-support-v4",
+        "android-support-v7-appcompat",
+        "android-support-v7-preference",
+        "android-support-v7-recyclerview",
+        "android-support-v14-preference",
+        "org.lineageos.platform.internal",
+    ],
+}
diff --git a/packages/LineageSettingsProvider/Android.mk b/packages/LineageSettingsProvider/Android.mk
deleted file mode 100644
index 9f4ffdee..00000000
--- a/packages/LineageSettingsProvider/Android.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Copyright (C) 2015 The CyanogenMod 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)
-
-src_dir := src
-res_dir := res
-
-LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dir))
-LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dir))
-
-LOCAL_PACKAGE_NAME := LineageSettingsProvider
-LOCAL_CERTIFICATE := platform
-LOCAL_PRIVILEGED_MODULE := true
-
-LOCAL_PRIVATE_PLATFORM_APIS := true
-
-LOCAL_STATIC_JAVA_LIBRARIES := \
-    android-support-v4 \
-    android-support-v7-appcompat \
-    android-support-v7-preference \
-    android-support-v7-recyclerview \
-    android-support-v14-preference \
-    org.lineageos.platform.internal
-
-include $(BUILD_PACKAGE)
-
-########################
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/packages/LineageSettingsProvider/tests/Android.bp b/packages/LineageSettingsProvider/tests/Android.bp
new file mode 100644
index 00000000..2d115382
--- /dev/null
+++ b/packages/LineageSettingsProvider/tests/Android.bp
@@ -0,0 +1,32 @@
+//
+// Copyright (C) 2018 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.
+//
+
+android_app {
+    tags: ["tests"],
+
+    name: "LineageSettingsProviderTests",
+    instrumentation_for: "LineageSettingsProvider",
+
+    srcs: ["**/*.java"],
+
+    certificate: "platform",
+    libs: ["android.test.runner"],
+    optimize: {
+        optimize: true,
+    },
+
+    static_libs: ["org.lineageos.platform.internal"],
+}
diff --git a/packages/LineageSettingsProvider/tests/Android.mk b/packages/LineageSettingsProvider/tests/Android.mk
index 733512d0..3e3bee56 100644
--- a/packages/LineageSettingsProvider/tests/Android.mk
+++ b/packages/LineageSettingsProvider/tests/Android.mk
@@ -15,27 +15,6 @@
 #
 LOCAL_PATH:= $(call my-dir)
 
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := tests
-
-LOCAL_PACKAGE_NAME := LineageSettingsProviderTests
-LOCAL_INSTRUMENTATION_FOR := LineageSettingsProvider
-
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-
-LOCAL_PRIVATE_PLATFORM_APIS := true
-
-LOCAL_CERTIFICATE := platform
-LOCAL_JAVA_LIBRARIES := android.test.runner
-LOCAL_PROGUARD_ENABLED := optimization
-LOCAL_PROGUARD_FLAG_FILES := proguard.flags
-
-LOCAL_STATIC_JAVA_LIBRARIES := \
-    org.lineageos.platform.internal
-
-include $(BUILD_PACKAGE)
-
 # Register as LineageTS
 include $(CLEAR_VARS)