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

Commit c9e617d1 authored by Yuntao Xu's avatar Yuntao Xu
Browse files

Add the PrintSpoolerLib module in Soong 

Added the PrintSpoolerLib module that is used as one dependency of the
ArcPrintSpooler module.

Bug: 205649904
Bug: 211801887
Test: compared the two apk files built by Make and Soong
Test: TreeHugger
Change-Id: I9b6d0c9f4620ed58d5be55862f9a18dcfefa9cfa
parent 6f01f95a

packages/PrintSpooler/Android.bp

+10 −4
Original line number Diff line number Diff line
@@ -34,18 +34,23 @@ license { 
android_app {

    name: "PrintSpooler",

    defaults: ["platform_app_defaults"],

    resource_dirs: [],

    platform_apis: true,

    jni_libs: ["libprintspooler_jni"],

    static_libs: [

        "PrintSpoolerLib",

    ],

}



android_library {

    name: "PrintSpoolerLib",

    resource_dirs: ["res"],



    srcs: [

        "src/**/*.java",

        "src/com/android/printspooler/renderer/IPdfRenderer.aidl",

        "src/com/android/printspooler/renderer/IPdfEditor.aidl",

    ],



    platform_apis: true,



    jni_libs: ["libprintspooler_jni"],

    static_libs: [

        "android-support-v7-recyclerview",

        "android-support-compat",
@@ -55,4 +60,5 @@ android_app { 
        "android-support-fragment",

        "android-support-annotations",

    ],

    manifest: "AndroidManifest.xml",

}

packages/PrintSpooler/src/com/android/printspooler/ui/SelectPrinterActivity.java

+9 −10
Original line number Diff line number Diff line
@@ -314,16 +314,15 @@ public final class SelectPrinterActivity extends Activity implements 


    @Override

    public boolean onContextItemSelected(MenuItem item) {

        switch (item.getItemId()) {

            case R.string.print_select_printer: {

        final int itemId = item.getItemId();

        if (itemId == R.string.print_select_printer) {

            PrinterInfo printer = item.getIntent().getParcelableExtra(EXTRA_PRINTER);

            onPrinterSelected(printer);

            } return true;



            case R.string.print_forget_printer: {

            return true;

        } else if (itemId == R.string.print_forget_printer) {

            PrinterId printerId = item.getIntent().getParcelableExtra(EXTRA_PRINTER_ID);

            mPrinterRegistry.forgetFavoritePrinter(printerId);

            } return true;

            return true;

        }

        return false;

    }