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

Commit 6d9b083e authored by Brett Chabot's avatar Brett Chabot Committed by Automerger Merge Worker
Browse files

Merge "Remove robolectric raw resources." am: 10dfedb7 am: 0427705b am:... 

Merge "Remove robolectric raw resources." am: 10dfedb7 am: 0427705b am: 912bda62 am: c1e9aa13

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2193501



Change-Id: I0428f75ea1f2facc4daae2701cdc0ca12082c0d5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a14f4fa9 c1e9aa13

core/res/Android.bp

+25 −35
Original line number Diff line number Diff line
@@ -73,18 +73,18 @@ genrule { 
        ":remote-color-resources-compile-colors",

    ],

    out: ["remote-color-resources.apk"],

    cmd: "$(location aapt2) link -o $(out) --manifest $(in)"

    cmd: "$(location aapt2) link -o $(out) --manifest $(in)",

}



genrule {

    name: "remote-color-resources-arsc",

    srcs: [":remote-color-resources-apk"],

    out: ["res/raw/remote_views_color_resources.arsc"],

    cmd: "mkdir -p $(genDir)/remote-color-resources-arsc && "

        + "unzip -x $(in) resources.arsc -d $(genDir)/remote-color-resources-arsc && "

        + "mkdir -p $$(dirname $(out)) && "

        + "mv $(genDir)/remote-color-resources-arsc/resources.arsc $(out) && "

        + "echo 'Created $(out)'"

    cmd: "mkdir -p $(genDir)/remote-color-resources-arsc && " +

        "unzip -x $(in) resources.arsc -d $(genDir)/remote-color-resources-arsc && " +

        "mkdir -p $$(dirname $(out)) && " +

        "mv $(genDir)/remote-color-resources-arsc/resources.arsc $(out) && " +

        "echo 'Created $(out)'",

}



genrule {
@@ -95,11 +95,11 @@ genrule { 
        "remote_color_resources_res/symbols.xml",

    ],

    out: ["remote_views_color_resources.zip"],

    cmd: "INPUTS=($(in)) && "

        + "RES_DIR=$$(dirname $$(dirname $${INPUTS[0]})) && "

        + "mkdir -p $$RES_DIR/values && "

        + "cp $${INPUTS[1]} $$RES_DIR/values && "

        + "$(location soong_zip) -o $(out) -C $$RES_DIR -D $$RES_DIR"

    cmd: "INPUTS=($(in)) && " +

        "RES_DIR=$$(dirname $$(dirname $${INPUTS[0]})) && " +

        "mkdir -p $$RES_DIR/values && " +

        "cp $${INPUTS[1]} $$RES_DIR/values && " +

        "$(location soong_zip) -o $(out) -C $$RES_DIR -D $$RES_DIR",

}



android_app {
@@ -154,16 +154,6 @@ java_genrule { 
    cmd: "cp $(in) $(out)",

}



// This logic can be removed once robolectric's transition to binary resources is complete

filegroup {

    name: "robolectric_framework_raw_res_files",

    srcs: [

        "assets/**/*",

        "res/**/*",

        ":remote-color-resources-arsc",

    ],

}



// Generate a text file containing a list of permissions that non-system apps

// are allowed to obtain.

genrule {
@@ -180,5 +170,5 @@ genrule { 
        // permission name, one per-line.

        " | sed -r 's/\\s*name=\\s*//g' | tr -d '\"'" +

        " > $(out)",

  tools: ["xmllint"]

    tools: ["xmllint"],

}