diff options
| author | Ryan Mitchell <rtmitchell@google.com> | 2020-06-05 16:11:20 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-05 16:11:20 +0000 |
| commit | 1b4cda227abd29b438cbe037d4c35400f6e7eed8 (patch) | |
| tree | 12f272a73f3125006f4102488d3812de45245208 /libs | |
| parent | 187c2f86b8270500510ab220a110dda0843087c9 (diff) | |
| parent | 2201f8b6269f88951762851e665cd781cc7f1b10 (diff) | |
Merge "Add policies and enforce overlayable to header" into rvc-dev am: 2201f8b626
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11481145
Change-Id: I71ff9f46e1e5a5016291a062dd5389078527588f
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/androidfw/include/androidfw/ResourceTypes.h | 5 | ||||
| -rw-r--r-- | libs/androidfw/tests/data/overlay/overlay.apk | bin | 2988 -> 2992 bytes | |||
| -rw-r--r-- | libs/androidfw/tests/data/overlay/overlay.idmap | bin | 1137 -> 1090 bytes |
3 files changed, 4 insertions, 1 deletions
diff --git a/libs/androidfw/include/androidfw/ResourceTypes.h b/libs/androidfw/include/androidfw/ResourceTypes.h index 2bfc7fc38d1c..21be81cb85bd 100644 --- a/libs/androidfw/include/androidfw/ResourceTypes.h +++ b/libs/androidfw/include/androidfw/ResourceTypes.h @@ -41,7 +41,7 @@ namespace android { constexpr const static uint32_t kIdmapMagic = 0x504D4449u; -constexpr const static uint32_t kIdmapCurrentVersion = 0x00000003u; +constexpr const static uint32_t kIdmapCurrentVersion = 0x00000004u; /** * In C++11, char16_t is defined as *at least* 16 bits. We do a lot of @@ -1746,6 +1746,9 @@ struct Idmap_header { uint32_t target_crc32; uint32_t overlay_crc32; + uint32_t fulfilled_policies; + uint8_t enforce_overlayable; + uint8_t target_path[256]; uint8_t overlay_path[256]; diff --git a/libs/androidfw/tests/data/overlay/overlay.apk b/libs/androidfw/tests/data/overlay/overlay.apk Binary files differindex 62e98662e68d..f1ed59279fdb 100644 --- a/libs/androidfw/tests/data/overlay/overlay.apk +++ b/libs/androidfw/tests/data/overlay/overlay.apk diff --git a/libs/androidfw/tests/data/overlay/overlay.idmap b/libs/androidfw/tests/data/overlay/overlay.idmap Binary files differindex 3759ed650033..29c5eb6a9ccf 100644 --- a/libs/androidfw/tests/data/overlay/overlay.idmap +++ b/libs/androidfw/tests/data/overlay/overlay.idmap |