transform Android.mk to Android.bp

To speed up the build speed and testing cycle. Android build system
find the all of Android.bp first and Android.mk later.

* bpfmt -s -w Android.bp

Fixes: 117403811
Test: atest DocumentsUITests
Change-Id: Id9400f9e8d279a70846635d04eb4e5d744d07650

8 files changed, 191 insertions, 127 deletions

diff --git a/Android.bp b/Android.bp
new file mode 100644
index 000000000..976d1e42f
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,73 @@
+java_defaults {
+    name: "documentsui_defaults",
+
+    static_libs: [
+        "androidx.appcompat_appcompat",
+        "androidx.legacy_legacy-support-core-ui",
+        "androidx.legacy_legacy-support-v13",
+        "androidx.legacy_legacy-support-v4",
+        "androidx.recyclerview_recyclerview",
+        "androidx.recyclerview_recyclerview-selection",
+        "androidx.transition_transition",
+        "com.google.android.material_material",
+        "guava",
+    ],
+
+    privileged: true,
+
+    certificate: "platform",
+
+    optimize: {
+        proguard_flags_files: ["proguard.flags"],
+    },
+
+    // TODO: build against public API as part of b/110959821
+    platform_apis: true,
+    // sdk_version: "current",
+}
+
+android_app {
+    name: "DocumentsUIMinimal",
+
+    defaults: ["documentsui_defaults"],
+
+    manifest: "minimal/AndroidManifest.xml",
+
+    srcs: [
+        "minimal/src/com/android/documentsui/picker/DummyPickActivity.java",
+        "src/com/android/documentsui/ScopedAccessActivity.java",
+        "src/com/android/documentsui/ScopedAccessMetrics.java",
+        "src/com/android/documentsui/ScopedAccessPackageReceiver.java",
+        "src/com/android/documentsui/ScopedAccessProvider.java",
+        "src/com/android/documentsui/archives/Archive.java",
+        "src/com/android/documentsui/archives/ArchiveId.java",
+        "src/com/android/documentsui/archives/ArchivesProvider.java",
+        "src/com/android/documentsui/archives/Loader.java",
+        "src/com/android/documentsui/archives/Proxy.java",
+        "src/com/android/documentsui/archives/ReadableArchive.java",
+        "src/com/android/documentsui/archives/WriteableArchive.java",
+        "src/com/android/documentsui/base/Providers.java",
+        "src/com/android/documentsui/base/SharedMinimal.java",
+        "src/com/android/documentsui/prefs/ScopedAccessLocalPreferences.java",
+    ],
+
+    resource_dirs: [
+        "minimal/res",
+    ],
+}
+
+android_app {
+    name: "DocumentsUI",
+
+    defaults: ["documentsui_defaults"],
+
+    manifest: "AndroidManifest.xml",
+
+    srcs: [
+        "src/**/*.java",
+    ],
+
+    resource_dirs: [
+        "res",
+    ],
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 677307561..000000000
--- a/Android.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-########################
-# Complete DocumentsUI app:
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := DocumentsUI
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-LOCAL_FULL_MANIFEST_FILE := $(LOCAL_PATH)/AndroidManifest.xml
-
-include $(LOCAL_PATH)/build_apk.mk
-
-########################
-# Minimal DocumentsUI app (supports Scoped Directory Access only):
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := \
-        src/com/android/documentsui/ScopedAccessActivity.java \
-        src/com/android/documentsui/ScopedAccessPackageReceiver.java \
-        src/com/android/documentsui/ScopedAccessProvider.java \
-        src/com/android/documentsui/ScopedAccessMetrics.java \
-        src/com/android/documentsui/archives/Archive.java \
-        src/com/android/documentsui/archives/ArchiveId.java \
-        src/com/android/documentsui/archives/ArchivesProvider.java \
-        src/com/android/documentsui/archives/Loader.java \
-        src/com/android/documentsui/archives/Proxy.java \
-        src/com/android/documentsui/archives/ReadableArchive.java \
-        src/com/android/documentsui/archives/WriteableArchive.java \
-        src/com/android/documentsui/base/Providers.java \
-        src/com/android/documentsui/base/SharedMinimal.java \
-        src/com/android/documentsui/prefs/ScopedAccessLocalPreferences.java \
-        minimal/src/com/android/documentsui/picker/DummyPickActivity.java
-
-LOCAL_PACKAGE_NAME := DocumentsUIMinimal
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/minimal/res
-LOCAL_FULL_MANIFEST_FILE := $(LOCAL_PATH)/minimal/AndroidManifest.xml
-
-include $(LOCAL_PATH)/build_apk.mk
-
-# Include makefiles for tests and libraries under the current path
-include $(call all-makefiles-under, $(LOCAL_PATH))
diff --git a/app-perf-tests/Android.bp b/app-perf-tests/Android.bp
new file mode 100644
index 000000000..9ed4c974a
--- /dev/null
+++ b/app-perf-tests/Android.bp
@@ -0,0 +1,30 @@
+android_test {
+    name: "DocumentsUIAppPerfTests",
+
+    manifest: "AndroidManifest.xml",
+
+    srcs: [
+        "src/**/*.java",
+    ],
+
+    libs: [
+        "android.test.base",
+        "android.test.runner",
+    ],
+
+    static_libs: [
+        "androidx.legacy_legacy-support-v4",
+        "mockito-target",
+        "ub-uiautomator",
+    ],
+
+    platform_apis: true,
+
+    instrumentation_for: "DocumentsUI",
+
+    certificate: "platform",
+
+    test_suites: ["device-tests"],
+
+    //sdk_version: "current",
+}
diff --git a/app-perf-tests/Android.mk b/app-perf-tests/Android.mk
deleted file mode 100644
index b073fba21..000000000
--- a/app-perf-tests/Android.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := tests
-#LOCAL_SDK_VERSION := current
-LOCAL_PRIVATE_PLATFORM_APIS := true
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src) \
-
-LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base
-LOCAL_STATIC_ANDROID_LIBRARIES := androidx.legacy_legacy-support-v4
-LOCAL_STATIC_JAVA_LIBRARIES := \
-    mockito-target \
-    ub-uiautomator
-
-LOCAL_USE_AAPT2 := true
-LOCAL_PACKAGE_NAME := DocumentsUIAppPerfTests
-LOCAL_INSTRUMENTATION_FOR := DocumentsUI
-
-LOCAL_COMPATIBILITY_SUITE += device-tests
-
-LOCAL_CERTIFICATE := platform
-
-include $(BUILD_PACKAGE)
-
diff --git a/perf-tests/Android.bp b/perf-tests/Android.bp
new file mode 100644
index 000000000..4a509d545
--- /dev/null
+++ b/perf-tests/Android.bp
@@ -0,0 +1,34 @@
+android_test {
+    name: "DocumentsUIPerfTests",
+
+    manifest: "AndroidManifest.xml",
+
+    srcs: [
+        ":DocumentsUIPerfTests-files",
+        "src/**/*.java",
+    ],
+
+    resource_dirs: [
+        "res",
+    ],
+
+    libs: [
+        "android.test.base",
+        "android.test.mock",
+        "android.test.runner",
+    ],
+
+    static_libs: [
+        "androidx.legacy_legacy-support-v4",
+        "espresso-core",
+        "mockito-target",
+        "ub-janktesthelper",
+        "ub-uiautomator",
+    ],
+
+    platform_apis: true,
+
+    instrumentation_for: "DocumentsUI",
+
+    certificate: "platform",
+}
diff --git a/perf-tests/Android.mk b/perf-tests/Android.mk
deleted file mode 100644
index 8d623926a..000000000
--- a/perf-tests/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := tests
-
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-LOCAL_SRC_FILES := $(call all-java-files-under, src) \
-    $(call all-java-files-under, ../tests/common/com/android/documentsui) \
-    ../tests/functional/com/android/documentsui/ActivityTest.java
-
-LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base android.test.mock
-LOCAL_STATIC_ANDROID_LIBRARIES := androidx.legacy_legacy-support-v4
-LOCAL_STATIC_JAVA_LIBRARIES := \
-    mockito-target \
-    ub-uiautomator \
-    ub-janktesthelper \
-    espresso-core
-
-LOCAL_USE_AAPT2 := true
-LOCAL_PACKAGE_NAME := DocumentsUIPerfTests
-LOCAL_PRIVATE_PLATFORM_APIS := true
-LOCAL_INSTRUMENTATION_FOR := DocumentsUI
-
-LOCAL_CERTIFICATE := platform
-
-include $(BUILD_PACKAGE)
-
diff --git a/tests/Android.bp b/tests/Android.bp
new file mode 100644
index 000000000..9d6a11673
--- /dev/null
+++ b/tests/Android.bp
@@ -0,0 +1,54 @@
+filegroup {
+    name: "DocumentsUIPerfTests-files",
+    srcs: [
+        "common/com/android/documentsui/**/*.java",
+        "functional/com/android/documentsui/ActivityTest.java",
+    ],
+}
+
+android_test {
+    name: "DocumentsUITests",
+
+    manifest: "AndroidManifest.xml",
+
+    srcs: [
+        "common/**/*.java",
+        "functional/**/*.java",
+        "unit/**/*.java",
+    ],
+
+    resource_dirs: [
+        "res",
+    ],
+
+    aaptflags: [
+        "-0 .zip",
+    ],
+
+    libs: [
+        "android.test.base",
+        "android.test.mock",
+        "android.test.runner",
+    ],
+
+    static_libs: [
+        "android-support-test",
+        "espresso-core",
+        "guava",
+        "mockito-target",
+        "truth-prebuilt",
+        "ub-uiautomator",
+    ],
+
+    jarjar_rules: "jarjar-rules.txt",
+
+    test_suites: [
+        "device-tests",
+    ],
+
+    platform_apis: true,
+
+    certificate: "platform",
+
+    instrumentation_for: "DocumentsUI",
+}
diff --git a/tests/Android.mk b/tests/Android.mk
deleted file mode 100644
index 4ff0c8a91..000000000
--- a/tests/Android.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-# unittests
-LOCAL_MODULE_TAGS := tests
-LOCAL_SRC_FILES := $(call all-java-files-under, common) \
-    $(call all-java-files-under, unit) \
-    $(call all-java-files-under, functional)
-
-# For testing ZIP files. Include testing ZIP files as uncompresseed raw
-# resources.
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-LOCAL_AAPT_FLAGS += -0 .zip
-
-LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base android.test.mock
-LOCAL_STATIC_JAVA_LIBRARIES := \
-    mockito-target \
-    ub-uiautomator \
-    espresso-core \
-    guava \
-    truth-prebuilt \
-    android-support-test
-
-LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt
-LOCAL_PACKAGE_NAME := DocumentsUITests
-LOCAL_PRIVATE_PLATFORM_APIS := true
-LOCAL_COMPATIBILITY_SUITE := device-tests
-LOCAL_INSTRUMENTATION_FOR := DocumentsUI
-LOCAL_CERTIFICATE := platform
-LOCAL_COMPATIBILITY_SUITE := device-tests
-
-include $(BUILD_PACKAGE)