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

Commit 374718a2 authored by Orion Hodson's avatar Orion Hodson Committed by Automerger Merge Worker
Browse files

resolve merge conflicts of 525ed1c2 to... 

resolve merge conflicts of 525ed1c2 to rvc-dev-plus-aosp am: be053b7e am: 08e54a12

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

Change-Id: Ic8bb64248051e1c39469f6e585dafec7e03d66c0
parents 8517455d 08e54a12

config/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -13,6 +13,6 @@ 
// limitations under the License.



filegroup {

    name: "preloaded-classes-blacklist",

    srcs: ["preloaded-classes-blacklist"],

    name: "preloaded-classes-denylist",

    srcs: ["preloaded-classes-denylist"],

}

config/generate-preloaded-classes.sh

+3 −3
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
# See the License for the specific language governing permissions and

# limitations under the License.

if [ "$#" -lt 2 ]; then

  echo "Usage $0 <input classes file> <blacklist file> [extra classes files]"

  echo "Usage $0 <input classes file> <denylist file> [extra classes files]"

  exit 1

fi
@@ -31,9 +31,9 @@ echo "# Preloaded-classes filter file for phones. 
#"



input=$1

blacklist=$2

denylist=$2

shift 2

extra_classes_files=("$@")



# Disable locale to enable lexicographical sorting

LC_ALL=C sort "$input" "${extra_classes_files[@]}" | uniq | grep -f "$blacklist" -v -F -x | grep -v "\$NoPreloadHolder"
 
LC_ALL=C sort "$input" "${extra_classes_files[@]}" | uniq | grep -f "$denylist" -v -F -x | grep -v "\$NoPreloadHolder"

tools/preload-check/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
java_test_host {

    name: "PreloadCheck",

    srcs: ["src/**/*.java"],

    java_resources: [":preloaded-classes-blacklist"],

    java_resources: [":preloaded-classes-denylist"],

    libs: ["tradefed"],

    test_suites: ["general-tests"],

    required: ["preload-check-device"],

tools/preload-check/src/com/android/preload/check/PreloadCheck.java

+3 −3
Original line number Diff line number Diff line
@@ -69,13 +69,13 @@ public class PreloadCheck implements IDeviceTest { 
    }



    /**

     * Test the classes mentioned in the embedded preloaded-classes blacklist.

     * Test the classes mentioned in the embedded preloaded-classes denylist.

     */

    @Test

    public void testBlackList() throws Exception {

    public void testDenyList() throws Exception {

        StringBuilder sb = new StringBuilder();

        try (BufferedReader br = new BufferedReader(new InputStreamReader(getClass()

                .getResourceAsStream("/preloaded-classes-blacklist")))) {

                .getResourceAsStream("/preloaded-classes-denylist")))) {

            String s;

            while ((s = br.readLine()) != null) {

                s = s.trim();