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

Commit e77ec52a authored by Bill Lin's avatar Bill Lin
Browse files

Migrate DocumentsUIGoogle for mainline module 

Update targetSdk to 29(Q) for mainline module
- Define DocumentsUI as a static_library
- DocumentsUIGoogle import DocumentsUI and sign mainline key

Test: make DocumentsUI, DocumentsUIGoogle
      ensure both DocumentsUI & DocumentsUIGoogle can build pass
      DocumentsUIGoogle.apk will be built in
      /product/priv-app/DocumentsUIGoogle/
      atest DocumentsUITests
      atest DocumentsUIGoogleTests
Fix: 123607299

Change-Id: Ie76506d2e57b023772148c1268191430c05a82fb
parent 6d679996

Android.bp

+26 −0
Original line number Diff line number Diff line
@@ -39,6 +39,32 @@ java_defaults { 
    sdk_version: "system_current",

}



filegroup {

    name: "DocumentsUI-srcs",

    srcs: [

        "src/**/*.java",

    ],

}



android_library {

    name: "DocumentsUI-res-lib",



    manifest: "AndroidManifest.xml",



    static_libs: [

        "androidx.appcompat_appcompat",

        "com.google.android.material_material",

    ],



    resource_dirs: [

        "res",

    ],



    aaptflags: [

        "--auto-add-overlay",

    ],

}



android_app {

    name: "DocumentsUI",

AndroidManifest.xml

+3 −1
Original line number Diff line number Diff line
@@ -26,7 +26,9 @@ 
    <uses-permission android:name="android.permission.CACHE_CONTENT" />

    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />



    <uses-sdk android:minSdkVersion="21"/>

    <uses-sdk

        android:targetSdkVersion="29"

        android:minSdkVersion="21"/>



    <application

        android:name=".DocumentsApplication"

tests/Android.bp

+29 −0
Original line number Diff line number Diff line
@@ -20,6 +20,35 @@ filegroup { 
    ],

}



filegroup {

    name: "DocumentsUITests-srcs",

    srcs: [

        "common/**/*.java",

        "functional/**/*.java",

        "unit/**/*.java",

    ],

}



android_library {

    name: "DocumentsUITests-res-lib",



    manifest: "AndroidManifest.xml",



    asset_dirs: [

        "assets",

    ],



    resource_dirs: [

        "res",

    ],



    aaptflags: [

        // pack some raw file locate in assets folder

        "-0 .zip",

        "--auto-add-overlay",

    ],

}



android_test {

    name: "DocumentsUITests",