summaryrefslogtreecommitdiff
path: root/cmds/idmap2/include
Commit message (Collapse)AuthorAgeFilesLines
* Fix idmap2 compiling against muslColin Cross2021-09-151-0/+2
| | | | | | | | | Add missing includes that are not transitively provided when compiling against musl. Bug: 190084016 Test: m USE_HOST_MUSL=true Change-Id: If8829cebb0c62b539d7a336b75cf106755588cdd
* idmap2: fix cpplint warningsMårten Kongstad2021-06-022-7/+11
| | | | | | Bug: 189963636 Test: frameworks/base/cmds/idmap2/static-checks.sh Change-Id: I6da18cdbbd2fc33db711696445230a9f316dc143
* OverlayManager Fabricated RROsRyan Mitchell2021-02-093-1/+7
| | | | | | | | | | | | | | | | | | | | | Adds registering and unregistering of FabricatedOverlay to the OMS. The process that creates the fabricated overlays owns it and is the only process allowed to unregister it. When a fabricated overlay is registered, overlay settings for it are initialized in all users. When a fabricated overlay is unregistered, it is disabled and removed from all users. When a new user is created, it will be able to use the fabricated overlay as well. On boot, fabricated overlays that are not referenced in overlay settings will be deleted. When the package that created the fabricated overlay is uninstalled, its fabricated overlays are also unregistered. Bug: 172471315 Test: atest OverlayDeviceTests Change-Id: I0539656f4c919246b13129579b0286c08a398dc2
* Add fabricated RRO generation to libidmap2Ryan Mitchell2021-02-099-198/+279
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fabricated Runtime Resource Overlays are overlays that are generated at runtime and are stored in the data/ partition. The system can fabricate RROs at runtime to dynamically theme the device. Idmaps can now be created from APK RROs and fabricated RROs. Rather than operating on ApkAssets, libidmap2 now operates on abstract resource "containers" that supply resource values. Target resource containers implement methods needed to query overlayable and target overlay information. Currently only APKs can be loaded as target resource containers. Overlay resource containers implement methods to supply the mapping of target resource to overlay value and other overlay information. The format of a fabricated RRO is as follows: 0x00 - 0x04 : fabricated overlay magic (always FRRO) 0x04 - 0x08 : file format version 0x08 - 0x0c : crc of version + proto data 0x0c - EOF : proto fabricated overlay data The magic is used to quickly detect if the file is a fabricated overlay. The version is incremented whenever backwards incompatible changes are made to the proto file format. Idmap must always be able to upgrade fabricated overlays from previous versions to new versions, so all previous versions must be checked into the tree. Bug: 172471315 Test: libidmap2_tests && libandroidfw_tests Change-Id: I4c9f29da278672e5695fb57d131a44c11a835180
* Read manifest values using resource id in idmap2Ryan Mitchell2021-01-081-1/+5
| | | | | | | | | | | | | Idmap2 currently reads android:targetPackage and android:targetName from overlay manifests by looking for an attribute with the name of the attribute resource. This fixes the divergence from package parsing by finding the attributes using their resource ids. Bug: 175060836 Test: libidmap2_tests Change-Id: I09965e5880a1e6c48c3f8077db0c595484804ce7
* Accept --overlay-name flag in idmap2Ryan Mitchell2021-01-062-21/+24
| | | | | | | | | | | | | | | | | | To support allowing for multiple <overlay> tags in one package, idmap2 must be able to generate an idmap for an individual <overlay> tag. `idmap2 create` now accepts a --overlay-name flag that specifies which tag to use to generate the idmap. The value of --overlay-name should be set to the value of the android:name attribute on the <overlay> tag to use. If the flag is not present, idmap2 will look for an <overlay> tag with no value for android:name. Bug: 162841629 Test: libandroidfw_tests Test: libidmap2_tests Change-Id: I02316d0b88773f02c04a5d462be9825016fa496d
* Remove idmap path 256 length limitRyan Mitchell2021-01-063-24/+18
| | | | | | | | | | | | | Overlay and target package paths can be longer than 256 characters. Currently, the idmap will fail to be generated if either path is longer than 256 characters. This change removes the 256 character limit and makes parsing variable length strings easier in libandroidfw. Bug: 174676094 Test: idmap2_tests && libandroidfw_tests Change-Id: Ic240cdb8700566b2ac2ade08da58bea852e4ae0c
* Revert^2 "libandroidfw hardening for IncFs"Ryan Mitchell2020-11-171-1/+2
| | | | | | 55ef6167a2c235bd88c7216238b2001b46795b79 Change-Id: I02d4890d181655dfd0a14c188468db512559d27b
* Revert "libandroidfw hardening for IncFs"Ryan Mitchell2020-11-131-2/+1
| | | | | | | | | | | | | | | Revert "Move map_ptr to incfs namspace" Revert submission 12787270 Reason for revert: b/173250495 Reverted Changes: I5cd1bc8a2:libandroidfw hardening for IncFs Ice5dbcfb2:Move map_ptr to incfs namspace I29ccdc8ed:Do not cache bag parent stack until requested I1e9e9acaa:Cache resolved theme values Change-Id: Ib90ef68339710086df41e9abe0833a542d03a74f
* libandroidfw hardening for IncFsRyan Mitchell2020-11-121-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate libandroifw to using incfs::util::map_ptr to prevent processes from crashing when parsing the resources.arsc, parsing compiled xml, files, and retrieving resource values. This change propagates incremental failures to the JNI level where they are raised as ResourcesNotFoundException. Performance of ResourcesPerfWorkloads without change (time in nanoseconds): [1/3] com.android.resources.perf.PerfTest#youtube: PASSED (11.883s) youtube_ns_median: 93812805 youtube_ns_standardDeviation: 4387062 youtube_ns_mean: 94455597 [2/3] com.android.resources.perf.PerfTest#maps: PASSED (11.265s) maps_ns_standardDeviation: 2997543 maps_ns_mean: 83480371 maps_ns_median: 82210941 [3/3] com.android.resources.perf.PerfTest#gmail: PASSED (24.963s) gmail_ns_median: 266141091 gmail_ns_standardDeviation: 3492043 gmail_ns_mean: 267472765 With change and verification forcibly enabled for all apks (including the framework-res.apk): [1/3] com.android.resources.perf.PerfTest#youtube: PASSED (11.646s) youtube_ns_median: 101999396 youtube_ns_standardDeviation: 4625782 youtube_ns_mean: 102631770 [2/3] com.android.resources.perf.PerfTest#maps: PASSED (11.286s) maps_ns_standardDeviation: 2692088 maps_ns_mean: 91326538 maps_ns_median: 90519884 [3/3] com.android.resources.perf.PerfTest#gmail: PASSED (24.694s) gmail_ns_median: 290284442 gmail_ns_standardDeviation: 5764632 gmail_ns_mean: 291660464 With change and verification disabled: [1/3] com.android.resources.perf.PerfTest#youtube: PASSED (11.748s) youtube_ns_median: 95490747 youtube_ns_standardDeviation: 7282249 youtube_ns_mean: 98442515 [2/3] com.android.resources.perf.PerfTest#maps: PASSED (10.862s) maps_ns_standardDeviation: 4484213 maps_ns_mean: 87912988 maps_ns_median: 86325549 [3/3] com.android.resources.perf.PerfTest#gmail: PASSED (24.034s) gmail_ns_median: 282175838 gmail_ns_standardDeviation: 6560876 gmail_ns_mean: 282869146 These tests were done on a Pixel 3 and with cpu settings configured by libs/hwui/tests/scripts/prep_generic.sh: Locked CPUs 4,5,6,7 to 1459200 / 2803200 KHz Disabled CPUs 0,1,2,3 Bug: 160635104 Bug: 169423204 Test: boot device && atest ResourcesPerfWorkloads Change-Id: I5cd1bc8a2257bffaba6ca4a1c96f4e6640106866
* Merge changes I1d3e5e66,I86b869af,Iab4d3902,I645ee722 am: 72864d2930 am: ↵Treehugger Robot2020-10-195-68/+81
|\ | | | | | | | | | | | | | | 968582e45f am: cb2ebfc692 am: c59b81c978 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1461087 Change-Id: Ib58c1acbb9629a6654eb8e1666872974f0c75944
| * Remove malloc/free for inline overlay valuesRyan Mitchell2020-10-145-68/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove malloc/free of android::ResTable_entry for inline overlay values. Add `target_entry_inline` to the idmap format to encode inline overlay values separate from direct mapping of target resource to overlay resource. This reduces the number of bytes needed to represent a direct mapping of target resource to overlay resource from 9 bytes to 8 bytes per entry. Fixed all idmap alignment issues that required the framework to use "#pragma pack(push, 1)" when loading idmaps. Bug: 170341022 Test: idmap2_tests and libandroidfw_tests Change-Id: Iab4d3902508f02773464724913e0ee966e3689e4
* | idmap2: remove the 'scan' commandMårten Kongstad2020-07-201-14/+0
|/ | | | | | | | | | | The 'scan' command has been replaced by 'create-multiple'. Remove the unused code. Also remove unused functions and #includes from FileUtils, and the obsolete JNI plumbing. Test: atest idmap2_tests OverlayDeviceTests OverlayHostTests Change-Id: Iae073c13ce64b5db48f22f7e723bc8c0c5fcd2c9
* idmap2: Set aidl_return to true on successRyan Mitchell2020-06-091-2/+2
| | | | | | | | | | | | | | | | | | idmap2d did not set the aidl return value to true when IdmapHeader::IsUpToDate succeeded. This regressed OMS initialization time. This change sets aidl_return to true when the header is up-to-date and also replaces usages of `uint32_t` for fulfilled_policies with `PolicyBitmask`. Bug: 158491243 Bug: 158535227 Bug: 158468195 Test: enable/disable overlays and onserve that verify succeeds Test: change the values of enforce overlayable and fulfilled policies and confirm that idmap verify fails Change-Id: If8febbfd0283d53211263690f85e2970706a33b7
* Add policies and enforce overlayable to headerRyan Mitchell2020-06-011-2/+15
| | | | | | | | | | | | | | | If the fulfilled policies change without the contents of the target and overlay APKs changing, the idmap for the overlay should be regenerated. This change adds fulfilled policies and enforce overlayable to the idmap header so that idmap2d can determine if the polices or enforce overlayable changed from what was used to generate the idmap. Bug: 119328308 Test: idmap2_tests Test: atest RegenerateIdmapTest Change-Id: I96f970e82b5243be01b205ac2cb6ab249c6100bc
* Reduce OMS start timeRyan Mitchell2020-04-281-0/+5
| | | | | | | | | | | | | | | | | | | This change attempts to reduce the amount of time initializing the OMS. The change: 1) Reduces the amount of time between subsequent attempts to connect to the idmap2d service when it is not alive. 2) Caches package infos retrieved from getOverlayPackages 3) Caches the crc of the android package to preventing having to retrieve it for every overlay package targeting the framework This chance reduced OMS start up time from ~500ms to ~100ms on a Pixel 3. If the idmap2d service is running when system sever starts then start up time will be around ~70ms. Bug: 151481016 Test: adb shell stop && adb shell start && [capture trace] Change-Id: I6137c385baf099413b62e98557419fffb9fd2d93
* Refactor overlayable policyWinson2020-02-264-49/+43
| | | | | | | | | | | | | | | | | | | | To make it easier to add the actor policy in a follow up CL, move most of the policy handling to a central location. The strings and transformation between strings and flags is now handled in libidmap2policies, with libandroidfw containing the single source of policy flags. This also extracts all the test resource IDs into an R.h so they can be swapped without having to edit a dozen files each time. Bug: 130563563 Test: m aapt2_tests idmapt2_tests and run from host test output Test: atest libandroidfw_tests Change-Id: Ie533c9cebf938215df7586f00c38763ae467e606
* Fix resourcesMap to work with shared librariesRyan Mitchell2020-02-061-0/+4
| | | | | | | | | | android:resourcesMap is not working at all with shared libraries. This change fixes that so overlays built as shared libraries can use the attribute. Bug: None Test: idmap2_tests Change-Id: I767481f88c58892a3818a919616056291b09b57e
* idmap2: add debug information to idmap file formatMårten Kongstad2019-12-195-9/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a new variable length string to the idmap file format. This string will hold debug information like fulfilled policies and any warnings triggered while generating the file. Bump the idmap version to 3. Adjust the idmap header definition in ResourceType.h to take the new string into account. Example debug info: $ idmap2 create \ --target-apk-path frameworks/base/cmds/idmap2/tests/data/target/target.apk \ --overlay-apk-path frameworks/base/cmds/idmap2/tests/data/overlay/overlay.apk \ --idmap-path /tmp/a.idmap \ --policy public \ --policy oem $ idmap2 dump --idmap-path /tmp/a.idmap target apk path : frameworks/base/cmds/idmap2/tests/data/target/target.apk overlay apk path : frameworks/base/cmds/idmap2/tests/data/overlay/overlay.apk I fulfilled_policies=oem|public enforce_overlayable=true W failed to find resource "integer/not_in_target" in target resources 0x7f010000 -> 0x7f010000 integer/int1 0x7f02000c -> 0x7f020000 string/str1 [...] $ idmap2 dump --idmap-path /tmp/a.idmap --verbose 00000000: 504d4449 magic 00000004: 00000003 version 00000008: 76a20829 target crc 0000000c: c054fb26 overlay crc 00000010: ........ target path: frameworks/base/cmds/idmap2/tests/data/target/target.apk 00000110: ........ overlay path: frameworks/base/cmds/idmap2/tests/data/overlay/overlay.apk 00000210: ........ debug info: ... 00000294: 7f target package id 00000295: 7f overlay package id [...] Also, tell cpplint to accept non-const references as function parameters: they make more sense as out-parameters than pointers that are assumed to be non-null. Also, switch to regular expressions in the RawPrintVisitorTests: no more manual fixups of the stream offsets! Tell cpplint that the <regex> header is OK to use. Bug: 140790707 Test: idmap2_tests Change-Id: Ib94684a3b4001240321801e21af8e132fbcf6609
* Idmap format changes for bidirectional lookupRyan Mitchell2019-10-175-55/+69
| | | | | | | | | | | | | | | | | | This change modifies the idmap file format to allow for target resources to map to arbitrary type/value combinations and to allow overlay resources to be mapped back to target resource ids so references to overlay resources can appear as references to target resources at runtime. The mappings of target resources to overlay resources and vice-versa are both encoded as sparse arrays. Instead of looking up a resource by indexing into an array that maps to the overlay resource id, the runtime will binary search over the sparse array to find the type and value that overlays the target resource. Bug: 135943783 Test: idmap2_tests Change-Id: I5d5344cdb7fe35f4f2e8d6781016299dea5d1e20
* Parse <overlay> and abstract resource mappingRyan Mitchell2019-10-043-15/+155
| | | | | | | | | | | | | | | This change introduces idmap parsing of <overlay> tags. The <overlay> tag allows one to explicitly map resources in the target to either a resource in the overlay or an inline attribute value. Use the android:resourcesMap atttribute on the <overlay> tag in the android manifest to specify a file to provide the resource mapping. Bug: 135943783 Bug: 135051420 Test: idmap2_tests Change-Id: I1740dcdc01849c43b1f2cb8c6645d666dbb05dba
* Improve idmap2 xml parsingRyan Mitchell2019-10-042-49/+147
| | | | | | | | | | | | | | | | | To parse the <overlay> tags for internal overlay references, we require the ability to parse XML. The current implementation only allows idmap2 to find a tag somewhere in an xml file. This implementation allows for the retrieval of an iterator that iterates over direct children xml elements. Now we can enforce that the <overlay> tag in the manifest is nested within the <manifest> tag and we can ensure <item> tags are within the <overlay> tags of the overlay resource configuration xml. Bug: 135051420 Bug: 135943783 Test: idmap2_tests Change-Id: I12f965b55c18960af6cf9dc6ca46429f53124c9a
* Merge "Revert "Improve idmap2 xml parsing""Ryan Mitchell2019-10-022-147/+49
|\
| * Revert "Improve idmap2 xml parsing"Ryan Mitchell2019-10-022-147/+49
| | | | | | | | | | | | | | | | This reverts commit 58cdc2a8226e8618331a81c1e1b77a4421bb5629. Reason for revert: <aosp/1129572 caused a build failure> Change-Id: Iecae19877dacf9ec5c2b2bc59dca362f573e9a7a
* | Merge "Add requiredSystemPropertyValue support in idmap2" am: b30f65713f am: ↵Ryan Mitchell2019-10-021-0/+2
|\ \ | |/ |/| | | | | | | | | | | fa9362aec9 am: b8a749dac6 am: 042900cf9a Change-Id: I8b7f30cc8088b4d04856358e7f1ffc18159b1b7f
| * Add requiredSystemPropertyValue support in idmap2Gabriel Siqueira2019-09-271-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Up to Android P, there was this feature were we are able to define "requiredSystemPropertyValue" in the AndroidManifest.xml of the RRO apk, so that it will only be loaded if requiredSystemPropertyValue/requiredSystemPropertyName are matched. Porting support from idmap https://android.googlesource.com/platform/frameworks/base/+/master/cmds/idmap/scan.cpp#135 To idmap2 https://android.googlesource.com/platform/frameworks/base/+/master/cmds/idmap2/idmap2/Scan.cpp#175 Bug: 140891738 Change-Id: I47752af93efa4563a60e336c1e1b1ffc081b51ec
* | Improve idmap2 xml parsingRyan Mitchell2019-10-012-49/+147
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To parse the <overlay> tags for internal overlay references, we require the ability to parse XML. The current implementation only allows idmap2 to find a tag somewhere in an xml file. This implementation allows for the retrieval of an iterator that iterates over direct children xml elements. Now we can enforce that the <overlay> tag in the manifest is nested within the <manifest> tag and we can ensure <item> tags are within the <overlay> tags of the overlay resource configuration xml. Bug: 135051420 Bug: 135943783 Test: idmap2_tests Change-Id: I1a1c4329514eb63b7575c4376adc0d8cda217269
* | idmap2: use 'override' where possibleMårten Kongstad2019-09-033-15/+18
|/ | | | | | | | Sprinkle idmap2 with the override specifier to help the compiler catch future errors. Test: builds Change-Id: I6932c5a80ac607f310e256620194e04acfd19ffd
* Add odm and oem policiesRyan Mitchell2019-04-171-2/+4
| | | | | | | | | This change adds parsing, encoding, and validating of odm and oem overlayable policies to aapt2, libandroidfw, and idmap2. Bug: 121033532 Test: aapt2_tests, idmap2_tests Change-Id: Ifc0d4b6c9f9c37e06b2988abade69dbb277c50c2
* Run idmap2 static-checks and fix formatting issuesRyan Mitchell2019-04-155-7/+1
| | | | | | Bug: 130324774 Test: builds Change-Id: I2cf9d3aa268ffe38e525fadee9d81fc6aefe19b1
* idmap2: move Idmap.h to ResultMårten Kongstad2019-03-201-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the signatures of Idmap::FromApkAssets and Idmap::FromBinaryStream from std::unique_ptr<const Idmap> func(..., std::ostream& out_error); to Result<std::unique_ptr<const Idmap>> func(...); The returned pointer is still a unique pointer to ensure the dynamically allocated memory is automatically released when no longer used. This means that using the returned value of either function requires one of two patterns: const auto idmap = func(...); if (!idmap) { return Error(...); } (*idmap)->accept(...); or auto result = func(...); if (!result) { return Error(...); } const auto idmap = std::move(*result); idmap->accept(...); Note that in the second example, result must be non-const or the call to std::move(*result) will not compile. With this change, the entire idmap2 project has been converted to use Result. Test: make idmap2_tests Change-Id: I533f4e03b99645523d94dd5f446ad76fb435f661
* idmap2: move commands to Result<Unit>Mårten Kongstad2019-03-192-2/+4
| | | | | | | | | | | | | | Change the signature of the idmap2 commands (Create, Dump, ...) to return Result<Unit> instead of bool. This removes the need to pass in an ostream for error messages: instead, those messages are part of the returned Result. Consolidate error messages: texts in Error objects should not be prefixed with "error:", that is the responsibility of the outer-most caller (i.e. main()). Test: make idmap2_tests Change-Id: I074881b3d1982ea8f4be5752161ac74b14fcba95
* Fix idmap scan to supply correct policiesRyan Mitchell2019-03-081-2/+10
| | | | | | | | | | Overlayable policies were not being passed correctly to idmap2 create from scan. This fixes that and adds better error messages for when policy failures occur. Bug: 127860892 Test: manual Change-Id: I8fae20884a75f4c57a0eb4aafdb4e09da3ebaf93
* idmap2: switch to improved Result classMårten Kongstad2019-02-273-17/+2
| | | | | | | | Remove the old std::optional based Result class, replace uses with the new std::variant based Result class. Test: make idmap2_tests Change-Id: I401cb36e5af06133a2872d835cf29bfb0b106597
* idmap2: add systrace logsMårten Kongstad2019-02-081-0/+87
| | | | | | | | | Thanks to the ART team for art/libartbase/base/systrace.h which served as inspiration for the SYSTRACE macro. Bug: 119761810 Test: run idmap2_tests on device while capturing systrace Change-Id: I81112ae8e58daf20ebed33ef8b0f5a0caa4dbc73
* idmap2: introduce improved Result classMårten Kongstad2019-02-061-0/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | Add a new version of the Result class that functions like the old Result, but in case of an error, also encodes a string detailing the error. This will allow us to write the following type of code: Result<Foo> CreateFoo() { if (...) { return Error("errno=%d", errno()); } return Foo(...); } auto foo = CreateFoo(); if (!foo) { std::cerr << "error: " << foo.GetErrorMessage() << std::endl; abort(); } std::cout << "foo=" << *foo << std::endl; This commit only adds the new Result class. A later change will replace uses of the old version. Test: make idmap2_tests Change-Id: I674d8a06866402adedf85f8514400f25840d5eda
* Merge "idmap2: lock down write access to /data/resouce-cache"TreeHugger Robot2019-01-241-0/+5
|\
| * idmap2: lock down write access to /data/resouce-cacheMårten Kongstad2019-01-181-0/+5
| | | | | | | | | | | | | | | | | | | | Deny write access to /data/resource-cache for UIDs other than root and system. While this is already handled by SELinux rules, add an additional layer of security to explicitly prevent malicious apps from messing with the system's idmap files. Test: make idmap2_tests Change-Id: Id986633558d5d02452276f05f64337a8700f148a
* | Add enforcement of overlayable targetNameRyan Mitchell2019-01-181-0/+14
|/ | | | | | | | | | | | | | | Adds android:targetName to the overlay manifest attributes and PackageParser reads the name into PackageInfo. Specifying android:targetName on an overlay allows the overlay to be associated with a particular set of overlayable resources. The overlay can only override the values of the resources defined within the target overlayable element. Test: idmap2_tests Bug: 119390855 Bug: 110869880 Change-Id: I1128274af4cae983f61ae15cdfcbface63233ff2
* Add enforcement of idmap policiesMårten Kongstad2019-01-163-5/+50
| | | | | | | | | | | | | | Teaches idmap2 to recognize policy restrictions put on overlayable resources. If overlayable enforcement is turned on for an overlay, then any resources defined within the overlayable api of the target will have policy restrictions imposed on them. All resources without overlayable definitions will continue to be overlayable without policy restrictions. Bug: 119390857 Test: atest idmap2 and booting Co-authored-by: Ryan Mitchell <rtmitchell@google.com> Change-Id: I7e435648eb6e4a87b0b90a7b2a0c3f33c1516ea6
* idmap2: fix clang-tidy warnings [modernize-*]Mårten Kongstad2018-12-217-33/+15
| | | | | | Bug: 120024673 Test: mmm frameworks/base/cmds/idmap2; check output Change-Id: I8768169fb7b541eb6b1aa3311c46a710eb71aac9
* idmap2: fix clang-tidy warnings [readability-*]Mårten Kongstad2018-12-201-0/+3
| | | | | | Bug: 120024673 Test: mmm frameworks/base/cmds/idmap2; check output Change-Id: I1565afac8d34e4347d8c946228d1134211e8b435
* idmap2: replace std::pair<bool, T> with Result<T>Mårten Kongstad2018-12-173-5/+35
| | | | | | | | | | | | | | | | | | | | | Introduce a new type Result<T> to indicate if an operation succeeded or not, and if it did, to hold the return value of the operation. This is the same as how std::pair<bool, T> is already used in the codebase, so replace all instances with Result<T> to improve clarity. Result<T> is simply an alias for std::optional<T>. The difference is semantic: use Result<T> as the return value for functions that can fail, use std::optional<T> when values are truly optional. This is modelled after Rust's std::result and std::option. A future change may graduate Result<T> to a proper class which can hold additional details on why an operation failed, such as a string or an error code. As a special case, continue to use std::unique_ptr<T> instead of Result<std::unique_ptr<T>> for now: the latter would increase code complexity without added benefit. Test: make idmap2_tests Change-Id: I2a8355107ed2b6485409e5e655a84cf1e20b9911
* idmap2: initial code dropMårten Kongstad2018-10-309-0/+702
idmap2 is a reboot of the idmap project. The project aims to - use modern C++ - greatly improve test and debug support - interface towards AssetManager2 (instead of AssetManager) - provide a solid foundation to add support for new features To make it easier to verify correctness, this first version of idmap2 is feature equivalent to idmap. Later versions will add support for new features such as <overlayable>. Bug: 78815803 Test: make idmap2_tests Change-Id: I1d806dc875a493e730ab55d2fdb027618e586d16