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

Commit 82a7ebd7 authored by Inseob Kim's avatar Inseob Kim
Browse files

Use RRO for product-specific resources 

Currently PackageInstaller is compiled differently, depending on the
product (tv / tablet) to select product-specific resources. That causes
divergence of system.img among targets.

Setting generate_product_characteristics_rro will automatically
generate an RRO package which contains resources having
product="{PRODUCT_CHARACTERISTICS}"'. The RRO package will be
installed to /product partition. PackageInstaller will instead be
compiled with '--product default', making system.img identical to all
targets. This also reduces complexity and duplicates of Android.bp.

Bug: 325011777
Test: boot and idmap2 dump
Change-Id: Ie345dd112a66bfd0d26d3b59a47bc2d982fe42c1
parent 5a92428a

packages/PackageInstaller/Android.bp

+1 −65
Original line number Original line Diff line number Diff line
@@ -59,69 +59,5 @@ android_app { 
    lint: {

    lint: {

        error_checks: ["Recycle"],

        error_checks: ["Recycle"],

    },

    },

}

    generate_product_characteristics_rro: true,



android_app {

    name: "PackageInstaller_tablet",

    defaults: ["platform_app_defaults"],



    srcs: [

        "src/**/*.java",

        "src/**/*.kt",

    ],



    certificate: "platform",

    privileged: true,

    platform_apis: false,

    sdk_version: "system_current",

    rename_resources_package: false,

    overrides: ["PackageInstaller"],



    static_libs: [

        "xz-java",

        "androidx.leanback_leanback",

        "androidx.fragment_fragment",

        "androidx.lifecycle_lifecycle-livedata",

        "androidx.lifecycle_lifecycle-extensions",

        "android.content.pm.flags-aconfig-java",

        "android.os.flags-aconfig-java",

    ],

    aaptflags: ["--product tablet"],



    lint: {

        error_checks: ["Recycle"],

    },

}



android_app {

    name: "PackageInstaller_tv",

    defaults: ["platform_app_defaults"],



    srcs: [

        "src/**/*.java",

        "src/**/*.kt",

    ],



    certificate: "platform",

    privileged: true,

    platform_apis: false,

    sdk_version: "system_current",

    rename_resources_package: false,

    overrides: ["PackageInstaller"],



    static_libs: [

        "xz-java",

        "androidx.leanback_leanback",

        "androidx.annotation_annotation",

        "androidx.fragment_fragment",

        "androidx.lifecycle_lifecycle-livedata",

        "androidx.lifecycle_lifecycle-extensions",

        "android.content.pm.flags-aconfig-java",

        "android.os.flags-aconfig-java",

    ],

    aaptflags: ["--product tv"],



    lint: {

        error_checks: ["Recycle"],

    },

}
 
}