From 7e019cd4afe7650f3b8e73cfa64c7da810fe9e18 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Thu, 16 Aug 2018 21:47:56 -0700
Subject: [PATCH] Convert frameworks/opt/setupwizard to Android.bp

See build/soong/README.md for more information.

Test: m checkbuild
Change-Id: I91ea161e67e416811d90854a91016c70dafb8ffb
Merged-In: I91ea161e67e416811d90854a91016c70dafb8ffb
(cherry-picked from commit d901a55fba2f2a80ec62f21a97cc11f98e8022c1)
---
 library/Android.bp       | 51 +++++++++++++++++++++++++++++++++++++
 library/Android.mk       | 54 ----------------------------------------
 navigationbar/Android.bp |  7 ++++++
 navigationbar/Android.mk |  9 -------
 4 files changed, 58 insertions(+), 63 deletions(-)
 create mode 100644 library/Android.bp
 delete mode 100644 library/Android.mk
 create mode 100644 navigationbar/Android.bp
 delete mode 100644 navigationbar/Android.mk

diff --git a/library/Android.bp b/library/Android.bp
new file mode 100644
index 0000000..13fcea9
--- /dev/null
+++ b/library/Android.bp
@@ -0,0 +1,51 @@
+//
+// Build the platform version of setup wizard library.
+//
+
+android_library {
+    name: "setup-wizard-lib",
+
+    libs: ["android-support-annotations"],
+    manifest: "main/AndroidManifest.xml",
+    resource_dirs: [
+        "main/res",
+        "platform/res",
+    ],
+    sdk_version: "current",
+    srcs: [
+        "main/src/**/*.java",
+        "platform/src/**/*.java",
+    ],
+    min_sdk_version: "23",
+}
+
+//
+// Build gingerbread-compat library, which uses AppCompat support library to provide backwards
+// compatibility back to SDK v9.
+//
+
+android_library {
+    name: "setup-wizard-lib-gingerbread-compat",
+    manifest: "main/AndroidManifest.xml",
+    resource_dirs: [
+        "main/res",
+        "gingerbread/res",
+        "recyclerview/res",
+    ],
+    sdk_version: "current",
+    srcs: [
+        "main/src/**/*.java",
+        "gingerbread/src/**/*.java",
+        "recyclerview/src/**/*.java",
+    ],
+
+    libs: [
+        "android-support-annotations",
+        "android-support-compat",
+        "android-support-core-ui",
+        "android-support-v7-appcompat",
+        "android-support-v7-recyclerview",
+    ],
+
+    min_sdk_version: "14",
+}
diff --git a/library/Android.mk b/library/Android.mk
deleted file mode 100644
index 6cbfae8..0000000
--- a/library/Android.mk
+++ /dev/null
@@ -1,54 +0,0 @@
-##
-# Build the platform version of setup wizard library.
-#
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_USE_AAPT2 := true
-LOCAL_JAVA_LIBRARIES := \
-    android-support-annotations
-LOCAL_MANIFEST_FILE := main/AndroidManifest.xml
-LOCAL_MODULE := setup-wizard-lib
-LOCAL_RESOURCE_DIR := \
-    $(LOCAL_PATH)/main/res \
-    $(LOCAL_PATH)/platform/res
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-java-files-under, main/src platform/src)
-LOCAL_MIN_SDK_VERSION := 23
-
-include $(BUILD_STATIC_JAVA_LIBRARY)
-
-
-##
-# Build gingerbread-compat library, which uses AppCompat support library to provide backwards
-# compatibility back to SDK v9.
-#
-
-include $(CLEAR_VARS)
-
-LOCAL_USE_AAPT2 := true
-
-LOCAL_AAPT2_ONLY := true
-
-LOCAL_MANIFEST_FILE := main/AndroidManifest.xml
-LOCAL_MODULE := setup-wizard-lib-gingerbread-compat
-LOCAL_RESOURCE_DIR := \
-    $(LOCAL_PATH)/main/res \
-    $(LOCAL_PATH)/gingerbread/res \
-    $(LOCAL_PATH)/recyclerview/res
-LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := $(call all-java-files-under, main/src gingerbread/src recyclerview/src)
-
-LOCAL_JAVA_LIBRARIES := \
-    android-support-annotations
-
-LOCAL_SHARED_ANDROID_LIBRARIES := \
-    android-support-compat \
-    android-support-core-ui \
-    android-support-v7-appcompat \
-    android-support-v7-recyclerview
-
-LOCAL_MIN_SDK_VERSION := 14
-
-include $(BUILD_STATIC_JAVA_LIBRARY)
diff --git a/navigationbar/Android.bp b/navigationbar/Android.bp
new file mode 100644
index 0000000..3868fe1
--- /dev/null
+++ b/navigationbar/Android.bp
@@ -0,0 +1,7 @@
+android_library {
+    name: "setup-wizard-navbar",
+
+    sdk_version: "current",
+    resource_dirs: ["res"],
+    srcs: ["src/**/*.java"],
+}
diff --git a/navigationbar/Android.mk b/navigationbar/Android.mk
deleted file mode 100644
index 5036990..0000000
--- a/navigationbar/Android.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SDK_VERSION := current
-LOCAL_MODULE := setup-wizard-navbar
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-include $(BUILD_STATIC_JAVA_LIBRARY)