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

Commit 4a2f136c authored by Sorin Basca's avatar Sorin Basca
Browse files

Add alternative for old debian mime types 

Bug: 387943358
Bug: 387972892
Test: atest CtsMimeMapTestCases:android.content.type.cts
(cherry picked from https://android-review.googlesource.com/q/commit:7d6574e642667226c3f0bbb28f0caa3679e75f5c)
Merged-In: I46242145bc8b1b0170673c0c2dde13f01af71e29

Change-Id: I46242145bc8b1b0170673c0c2dde13f01af71e29
parent 204bcfca

mime/Android.bp

+37 −0
Original line number Diff line number Diff line
@@ -49,6 +49,17 @@ java_library { 
    ],

}



java_library {

    name: "mimemap-testing-alt",

    defaults: ["mimemap-defaults"],

    static_libs: ["mimemap-testing-alt-res.jar"],

    jarjar_rules: "jarjar-rules-alt.txt",

    visibility: [

        "//cts/tests/tests/mimemap:__subpackages__",

        "//frameworks/base:__subpackages__",

    ],

}



// The mimemap-res.jar and mimemap-testing-res.jar genrules produce a .jar that

// has the resource file in a subdirectory res/ and testres/, respectively.

// They need to be in different paths because one of them ends up in a
@@ -86,6 +97,19 @@ java_genrule { 
    cmd: "mkdir $(genDir)/testres/ && cp $(in) $(genDir)/testres/ && $(location soong_zip) -C $(genDir) -o $(out) -D $(genDir)/testres/",

}



// The same as mimemap-testing-res.jar except that the resources are placed in a different directory.

// They get bundled with CTS so that CTS can compare a device's MimeMap implementation vs.

// the stock Android one from when CTS was built.

java_genrule {

    name: "mimemap-testing-alt-res.jar",

    tools: [

        "soong_zip",

    ],

    srcs: [":mime.types.minimized-alt"],

    out: ["mimemap-testing-alt-res.jar"],

    cmd: "mkdir $(genDir)/testres-alt/ && cp $(in) $(genDir)/testres-alt/ && $(location soong_zip) -C $(genDir) -o $(out) -D $(genDir)/testres-alt/",

}



// Combination of all *mime.types.minimized resources.

filegroup {

    name: "mime.types.minimized",
@@ -99,6 +123,19 @@ filegroup { 
    ],

}



// Combination of all *mime.types.minimized resources.

filegroup {

    name: "mime.types.minimized-alt",

    visibility: [

        "//visibility:private",

    ],

    srcs: [

        ":debian.mime.types.minimized-alt",

        ":android.mime.types.minimized",

        ":vendor.mime.types.minimized",

    ],

}



java_genrule {

    name: "android.mime.types.minimized",

    visibility: [

mime/jarjar-rules-alt.txt

0 → 100644
+1 −0
Original line number Diff line number Diff line 
rule android.content.type.DefaultMimeMapFactory android.content.type.cts.StockAndroidAltMimeMapFactory

mime/jarjar-rules.txt

+1 −1

File changed.

Contains only whitespace changes.