Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit acf1bd45 authored by felkachang's avatar felkachang
Browse files

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
parent 243cf9c6

Android.bp

0 → 100644
+73 −0
Original line number Original line Diff line number Diff line 
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",

    ],

}

Android.mk

deleted100644 → 0
+0 −43
Original line number Original line Diff line number Diff line 
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))

app-perf-tests/Android.bp

0 → 100644
+30 −0
Original line number Original line Diff line number Diff line 
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",

}

app-perf-tests/Android.mk

deleted100644 → 0
+0 −25
Original line number Original line Diff line number Diff line 
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)

perf-tests/Android.bp

0 → 100644
+34 −0
Original line number Original line Diff line number Diff line 
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",

}