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

Commit a98767ab authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Apply static RRO"

parents 1809db5c 0434289c

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -751,6 +751,7 @@ package android { 
    field public static final int isModifier = 16843334; // 0x1010246

    field public static final int isRepeatable = 16843336; // 0x1010248

    field public static final int isScrollContainer = 16843342; // 0x101024e

    field public static final int isStatic = 16844125; // 0x101055d

    field public static final int isSticky = 16843335; // 0x1010247

    field public static final int isolatedProcess = 16843689; // 0x10103a9

    field public static final int isolatedSplits = 16844109; // 0x101054d

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -864,6 +864,7 @@ package android { 
    field public static final int isModifier = 16843334; // 0x1010246

    field public static final int isRepeatable = 16843336; // 0x1010248

    field public static final int isScrollContainer = 16843342; // 0x101024e

    field public static final int isStatic = 16844125; // 0x101055d

    field public static final int isSticky = 16843335; // 0x1010247

    field public static final int isolatedProcess = 16843689; // 0x10103a9

    field public static final int isolatedSplits = 16844109; // 0x101054d

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -751,6 +751,7 @@ package android { 
    field public static final int isModifier = 16843334; // 0x1010246

    field public static final int isRepeatable = 16843336; // 0x1010248

    field public static final int isScrollContainer = 16843342; // 0x101024e

    field public static final int isStatic = 16844125; // 0x101055d

    field public static final int isSticky = 16843335; // 0x1010247

    field public static final int isolatedProcess = 16843689; // 0x10103a9

    field public static final int isolatedSplits = 16844109; // 0x101054d

cmds/idmap/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ include $(CLEAR_VARS) 


LOCAL_SRC_FILES := idmap.cpp create.cpp scan.cpp inspect.cpp



LOCAL_SHARED_LIBRARIES := liblog libutils libandroidfw

LOCAL_SHARED_LIBRARIES := liblog libutils libandroidfw libcutils



LOCAL_MODULE := idmap

cmds/idmap/idmap.cpp

+2 −2
Original line number Diff line number Diff line
@@ -49,8 +49,8 @@ OPTIONS \n\ 
      --path: create idmap for target package 'target' (path to apk) and overlay package \n\

              'overlay' (path to apk); write results to 'idmap' (path). \n\

\n\

      --scan: non-recursively search directory 'dir-to-scan' (path) for overlay packages with \n\

              target package 'target-package-name-to-look-for' (package name) present at\n\

      --scan: non-recursively search directory 'dir-to-scan' (path) for static overlay packages \n\

              with target package 'target-package-name-to-look-for' (package name) present at\n\

              'path-to-target-apk' (path to apk). For each overlay package found, create an\n\

              idmap file in 'dir-to-hold-idmaps' (path). \n\

\n\