Merge changes from topic "inc-hard-am"
* changes: Revert^2 "Cache resolved theme values" Set resource id correctly when resolve fails Revert^2 "libandroidfw hardening for IncFs" idmap2: remove call to obsolete 'idmap2 verify' from valgrind.sh idmap2: remove the 'scan' command
No related branches found
No related tags found
Showing
- cmds/idmap2/Android.bp 0 additions, 1 deletioncmds/idmap2/Android.bp
- cmds/idmap2/idmap2/Commands.h 0 additions, 1 deletioncmds/idmap2/idmap2/Commands.h
- cmds/idmap2/idmap2/Lookup.cpp 25 additions, 46 deletionscmds/idmap2/idmap2/Lookup.cpp
- cmds/idmap2/idmap2/Main.cpp 4 additions, 2 deletionscmds/idmap2/idmap2/Main.cpp
- cmds/idmap2/idmap2/Scan.cpp 0 additions, 257 deletionscmds/idmap2/idmap2/Scan.cpp
- cmds/idmap2/include/idmap2/FileUtils.h 0 additions, 14 deletionscmds/idmap2/include/idmap2/FileUtils.h
- cmds/idmap2/include/idmap2/ResourceMapping.h 2 additions, 1 deletioncmds/idmap2/include/idmap2/ResourceMapping.h
- cmds/idmap2/libidmap2/FileUtils.cpp 0 additions, 60 deletionscmds/idmap2/libidmap2/FileUtils.cpp
- cmds/idmap2/libidmap2/PrettyPrintVisitor.cpp 2 additions, 3 deletionscmds/idmap2/libidmap2/PrettyPrintVisitor.cpp
- cmds/idmap2/libidmap2/ResourceMapping.cpp 26 additions, 28 deletionscmds/idmap2/libidmap2/ResourceMapping.cpp
- cmds/idmap2/libidmap2/ResourceUtils.cpp 8 additions, 8 deletionscmds/idmap2/libidmap2/ResourceUtils.cpp
- cmds/idmap2/libidmap2/XmlParser.cpp 6 additions, 5 deletionscmds/idmap2/libidmap2/XmlParser.cpp
- cmds/idmap2/tests/FileUtilsTests.cpp 0 additions, 57 deletionscmds/idmap2/tests/FileUtilsTests.cpp
- cmds/idmap2/tests/Idmap2BinaryTests.cpp 0 additions, 125 deletionscmds/idmap2/tests/Idmap2BinaryTests.cpp
- cmds/idmap2/valgrind.sh 0 additions, 2 deletionscmds/idmap2/valgrind.sh
- core/java/android/content/res/AssetManager.java 0 additions, 1 deletioncore/java/android/content/res/AssetManager.java
- core/jni/android_content_res_ApkAssets.cpp 10 additions, 4 deletionscore/jni/android_content_res_ApkAssets.cpp
- core/jni/android_util_AssetManager.cpp 219 additions, 284 deletionscore/jni/android_util_AssetManager.cpp
- core/jni/android_util_AssetManager_private.h 54 additions, 0 deletionscore/jni/android_util_AssetManager_private.h
- core/jni/android_util_StringBlock.cpp 54 additions, 49 deletionscore/jni/android_util_StringBlock.cpp
Loading
Please register or sign in to comment