summaryrefslogtreecommitdiffstats
path: root/tools/aapt
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | am 8bdb265f: am 19f9d54f: Merge "Fix backwards compat problem with AAPT ↵Adam Lesinski2014-09-193-3/+225
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | public attrs" into lmp-dev * commit '8bdb265f0a73bc6f2114ca70f141c214a23696c7': Fix backwards compat problem with AAPT public attrs
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'fa31eb2c' into manualmergeAdam Lesinski2014-11-104-22/+55
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/split-select/RuleGenerator_test.cpp Change-Id: I0d1261301d433f32e857cf1b0d75a861205f7625
| * | | | | | | | | | | | | | | split-select: Fix rules generated for anydpi densityAdam Lesinski2014-11-064-22/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9de569ca9a76eb22df4d0e178df847ba1c7d0b01
* | | | | | | | | | | | | | | | Merge commit 'fb96e54' into manualmergeAdam Lesinski2014-11-058-5/+238
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/aapt/Resource.cpp Change-Id: I4147c3550e9426f3429146eaeb16f10ba76b5b15
| * | | | | | | | | | | | | | | Add error checking to aapt for split generationAdam Lesinski2014-11-038-5/+237
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ica627db6a671f6a6c35f98bfd9c03598ffe103ce
* | | | | | | | | | | | | | | | Fix automerge issueAdam Lesinski2014-11-031-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Duplicate method declaration. Change-Id: I9355bd7c716e668ad7892fd12e93352455d149b5
* | | | | | | | | | | | | | | | Merge "Fix build due to bad merge" into lmp-mr1-dev-plus-aospAdam Lesinski2014-11-041-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Fix build due to bad mergeAdam Lesinski2014-11-031-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - tools/aapt/qsort_r_compat.c was removed and the merge added it back to the src list in Android.mk Change-Id: I15aae8adc68f82ac2381020ac0b96a7b1ab59f9c
* | | | | | | | | | | | | | | | | am 5fa90218: am f7ffcaa7: Merge "Build the split-select tool without C++11 ↵Adam Lesinski2014-11-041-3/+37
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| / / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | support" into lmp-mr1-dev * commit '5fa9021822577f1e4676db49a6b5cb5d36e4614a': Build the split-select tool without C++11 support
| * | | | | | | | | | | | | | | Merge "Build the split-select tool without C++11 support" into lmp-mr1-devAdam Lesinski2014-11-031-3/+37
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Build the split-select tool without C++11 supportAdam Lesinski2014-11-031-3/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was complicated to get the tool building on Windows, Linux, and OSX with C++11 support. OSX uses Clang to build C++11 binaries, which requires the libc++ standard library. Since most of the dependencies of this program are built against libstdc++, this was difficult to resolve. Now we build without C++11 support. Change-Id: I4e537c113734508a8f480a1c402ed237de4f0e60
* | | | | | | | | | | | | | | | | Merge commit '78be0498' into manualmergeAdam Lesinski2014-11-037-43/+44
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libs/androidfw/ResourceTypes.cpp tools/aapt/Android.mk tools/aapt/StringPool.cpp tools/aapt/StringPool.h Change-Id: I9d69efdfb892032895ace12159d193304f02dc6c
| * | | | | | | | | | | | | | | | Fix issues that will be present in C++11Adam Lesinski2014-11-039-63/+64
| |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - char16_t is a distinct type, so stay consistent with it throughout the code base. - char16_t is defined as minimum size of 16 bits. Since we mmap and cast data structures onto raw memory, we need a precise definition (uint16_t), so we cast between that (and static_assert that they are the same size). Change-Id: I869c32637543bbcfb39d2643e7d9df10d33acd3c
* | | | | | | | | | | | | | | | Merge "aapt updates for Android TV" into lmp-mr1-dev automerge: 6af7d76Tim Kilbourn2014-10-241-1/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 181c18e * commit '181c18efd438f7a5e8cc18327367c49bf51795be': aapt updates for Android TV
| * | | | | | | | | | | | | | | aapt updates for Android TVTim Kilbourn2014-10-241-1/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Output whether an app claims to be a game (android:isGame) - Output android:banner if it is specified at the application level. Change-Id: I7118b524f62cdfc4effeef21b32b3cdd814d9bfa
* | | | | | | | | | | | | | | | Merge commit 'cd8442d4' into manualmergeAdam Lesinski2014-10-234-4/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/aapt/ResourceIdCache.cpp Change-Id: I5341d47ed0fe891d6fefb174f644e636ce966eb8
| * | | | | | | | | | | | | | | First commit of split-select toolAdam Lesinski2014-10-234-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This tool emits a set of rules as JSON for when a Split APK should match a target device. Change-Id: I8bfbdfbdb51efcfc645889dd03e1961f16e39645
* | | | | | | | | | | | | | | | am 9295a135: am e40974d9: Merge "Fix an overflow found by ASAN."Dan Albert2014-10-201-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9295a1354eb8220be9a0a40985253c6cdfac35c3': Fix an overflow found by ASAN.
| * | | | | | | | | | | | | | | Fix an overflow found by ASAN.Dan Albert2014-10-201-1/+1
| | |_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes len is 0. Change-Id: I031000188edc57663a5519b00cbbb751600d32f4
* | | | | | | | | | | | | | | am d3969d92: am 6dfe03ae: am 73a8c596: am 3f8c7dec: Merge "AAPT: Fix path ↵Adam Lesinski2014-10-201-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for final generated resources on Windows" into lmp-dev * commit 'd3969d927eef2f04ec097244c5f2bff5e7c0689e': AAPT: Fix path for final generated resources on Windows
| * | | | | | | | | | | | | | am 73a8c596: am 3f8c7dec: Merge "AAPT: Fix path for final generated ↵Adam Lesinski2014-10-201-1/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resources on Windows" into lmp-dev * commit '73a8c5962d4d28a2e8aa6fa0b0b18e39782ee79c': AAPT: Fix path for final generated resources on Windows
| | * | | | | | | | | | | | | AAPT: Fix path for final generated resources on WindowsAdam Lesinski2014-10-201-1/+4
| | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id11ac79b281b51747c73f90406ebd60023c54f92
* | | | | | | | | | | | | | am dd64fc43: am effd416e: am 83fae208: am 3cd840f4: Merge "AAPT: Fix an ↵Adam Lesinski2014-10-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | issue where a resource name was incorrectly derived on Windows" into lmp-dev * commit 'dd64fc43a6c560d3c545132adc16cd4a079f9600': AAPT: Fix an issue where a resource name was incorrectly derived on Windows
| * | | | | | | | | | | | | am 83fae208: am 3cd840f4: Merge "AAPT: Fix an issue where a resource name ↵Adam Lesinski2014-10-171-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | was incorrectly derived on Windows" into lmp-dev * commit '83fae208fee402d8a6a51362f99660f9a49bd5a4': AAPT: Fix an issue where a resource name was incorrectly derived on Windows
| | * | | | | | | | | | | | AAPT: Fix an issue where a resource name was incorrectly derived on WindowsAdam Lesinski2014-10-171-1/+1
| | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calling String8::getLeaf() will assume the system's file path separator, however the source string was already converted to a unix path. getLeaf() would therefore not find any occurence of '\' and would return the full path. Bug:18036805 Change-Id: Ic2bfac0cc553406740204a296327e266b05c0eff
* | | | | | | | | | | | | am 87a529c8: am 12c84b5d: Merge "Minor resource notation/compatibility ↵Adam Lesinski2014-10-171-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes" into lmp-mr1-dev * commit '87a529c899045cf2785b86e4e289dd6c6cf56c1a': Minor resource notation/compatibility fixes
| * | | | | | | | | | | | Minor resource notation/compatibility fixesAdam Lesinski2014-10-171-3/+3
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Change the format of mnc/mcc when printing a resource-qualifier formatted string from a Configuration object. - Correctly bump the SDK to 21 when using anydpi in a resource qualifier. Change-Id: I3c31e344dc5384d45398d6e9f264a073abab65d1
* | | | | | | | | | | | am e36550dc: am 0757e5fd: am c9c512e0: am f47f8855: Merge "Added a daemon ↵Jerome Dochez2014-10-104-0/+40
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mode to aapt to receive streams of commands from gradle." into lmp-dev * commit 'e36550dc9e202450d0921bf65d00d14e7e3e8a54': Added a daemon mode to aapt to receive streams of commands from gradle.
| * | | | | | | | | | | Merge "Added a daemon mode to aapt to receive streams of commands from ↵Jerome Dochez2014-10-104-0/+40
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | gradle." into lmp-dev
| | * | | | | | | | | | Added a daemon mode to aapt to receive streams of commands from gradle.Jerome Dochez2014-10-024-0/+40
| | | |_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When crunching png, we used to spawn a separate aapt process from java which is slow and resource intensive. Introduced a daemon mode to appt which when invoked with -m parameter will listen from commands on stdin and give report of command execution on stdout. One one command is supported so far : s f1 f2 This command perform a single png crunch, f1 pointing to the input png file to crunch, and f2 pointing to the path for the resulting crunced file. Expected output from the command is "Done" or "Error". Change-Id: Iaf1d865e8d5ee5d36abe39dea6443715865a98d3
* | | | | | | | | | | am 85035d90: am b2b166a5: am 397001b2: am a80aba70: Merge "AAPT: Gate v21 ↵Adam Lesinski2014-10-041-20/+26
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resource synthesizing logging behind -v flag" into lmp-dev * commit '85035d90257beedd54641385674ce2dfb29ae241': AAPT: Gate v21 resource synthesizing logging behind -v flag
| * | | | | | | | | | AAPT: Gate v21 resource synthesizing logging behind -v flagAdam Lesinski2014-10-031-20/+26
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is verbose information and should be hidden behind the -v flag. Bug:17822471 Change-Id: I36e2c6beb54669a31cde73416427477a80ded8a6
* | | | | | | | | | am 25a8e43b: am 7d92ae6d: am 5b3be618: am 70de9c0d: Merge "include direct.h ↵Stephen Hines2014-10-021-0/+3
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for _mkdir" into lmp-dev * commit '25a8e43b13e719ff97edd174f8b1ed175e6f91b0': include direct.h for _mkdir
| * | | | | | | | | include direct.h for _mkdirAndrew Hsieh2014-09-301-0/+3
| | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14416410 The new mingw-w64 toolchain x86_64-w64-mingw32-4.8 no longer declares _mkdir in io.h. Change-Id: I624b52d2f35db54a7f28df09f997fc883b0f0557
* | | | | | | | | am 152d9aae: am 31629651: Merge "Frameworks/base: Fix more aapt issues"Andreas Gampe2014-10-024-30/+51
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | * commit '152d9aae631381ea28f5701168d372a1486a7502': Frameworks/base: Fix more aapt issues
| * | | | | | | | Frameworks/base: Fix more aapt issuesAndreas Gampe2014-10-014-30/+51
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Change-Id: I6da7dc674e9f9e3b0886a3cfd1e3194d6b5ac948
* | | | | | | | resolved conflicts for merge of 1dcc75b2 to lmp-mr1-dev-plus-aospAndreas Gampe2014-10-0113-387/+540
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | Change-Id: I8f7cbd971beae3ab134195e612d705860665142f
| * | | | | | | Frameworks/base: Fix AAPT warningsAndreas Gampe2014-10-0114-389/+527
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Turn on -Wall -Werror. Fix warnings. Change-Id: I287fb3c1e851c654479bcf9ea8c73bd354a6b2a1
* | | | | | | resolved conflicts for merge of fe50cfd5 to lmp-mr1-dev-plus-aospDan Albert2014-10-015-142/+22
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | Change-Id: Id09c2786db18fa7e747cd1652ea95f575c3f5c46
| * | | | | | Use std::sort instead of qsort_r wrapper.Dan Albert2014-10-015-142/+22
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The HAVE_(BSD|GNU)_QSORT_R in AndroidConfig.h has never worked, and we should just be using something standard anyway. Change-Id: I784d6212f6c890a11c4af2f83d1ce2d279708652
* | | | | | am a196e203: am 98e858b1: am 581dfee1: am 0a6c5ea4: Merge "AAPT: Fix issue ↵Adam Lesinski2014-09-262-1/+19
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | with synthesized resource not actually showing up" into lmp-dev * commit 'a196e203076cb810a21a702b41f6a1d82d029318': AAPT: Fix issue with synthesized resource not actually showing up
| * | | | | AAPT: Fix issue with synthesized resource not actually showing upAdam Lesinski2014-09-242-1/+19
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AAPT keeps around a few pieces of state that are disjoint, so simply adding to a collection won't add the resource to the final flattened output. Instead, we create the resource from the top and then copy over the values into the newly created resource. Bug:17647890 Change-Id: I214263e84c18f9370c6e6a5aa53aa2d833fc842d
* | | | | am d4e5b601: am 37e3df38: am 1aa4db07: am 81745c51: Merge "AAPT: ↵Adam Lesinski2014-09-229-36/+316
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Continuation of public/private attribute fix" into lmp-dev * commit 'd4e5b601c7da5c662d8cf9c46177810fdeeed23f': AAPT: Continuation of public/private attribute fix
| * | | | AAPT: Continuation of public/private attribute fixAdam Lesinski2014-09-229-36/+316
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | XML files like layouts are now scanned and checked for v21 attributes. If those kinds of attributes are found, then we remove them in the original version and synthesize a new xml file under the v21 configuration. Bug:17520380 Change-Id: Icf984cb96134180a2e35349c1dbf2cef9a8f0bda
* | | | resolved conflicts for merge of 1a4527ce to lmp-mr1-dev-plus-aospDan Albert2014-09-191-3/+2
|\ \ \ \ | | |/ / | |/| | | | | | Change-Id: If649bd9ef98181a1e1e341cc5b73d237586fb72c
| * | | Clean up makefile cruft.Dan Albert2014-09-111-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | The build system already takes care of all these things. Change-Id: Idef80b554e07cef5e5ed2adf1b5740a76f13ef6d
* | | | am 9ee3ba23: am e7e9ad6d: am 863b1a90: am 19f9d54f: Merge "Fix backwards ↵Adam Lesinski2014-09-193-3/+225
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| | | | | | | | compat problem with AAPT public attrs" into lmp-dev * commit '9ee3ba23395bd1a13bbfd3fe523ee611a5ca001b': Fix backwards compat problem with AAPT public attrs
| * | Fix backwards compat problem with AAPT public attrsAdam Lesinski2014-09-183-3/+225
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AAPT has traditionally assigned resource IDs to public attributes, and then followed those public definitions with private attributes. --- PUBLIC --- | 0x01010234 | attr/color | 0x01010235 | attr/background --- PRIVATE --- | 0x01010236 | attr/secret | 0x01010237 | attr/shhh Each release, when attributes are added, they take the place of the private attributes and the private attributes are shifted down again. --- PUBLIC --- | 0x01010234 | attr/color | 0x01010235 | attr/background | 0x01010236 | attr/shinyNewAttr | 0x01010237 | attr/highlyValuedFeature --- PRIVATE --- | 0x01010238 | attr/secret | 0x01010239 | attr/shhh Platform code may look for private attributes set in a theme. If an app compiled against a newer version of the platform uses a new public attribute that happens to have the same ID as the private attribute the older platform is expecting, then the behavior is undefined. We get around this by detecting any newly defined attributes (in L), copy the resource into a -v21 qualified resource, and delete the attribute from the original resource. This ensures that older platforms don't see the new attribute, but when running on L+ platforms, the attribute will be respected. We still need to address this problem in the platform moving forward, as this will only help us in the transition from pre L to L. Bug:17520380 Change-Id: Ia2a985798b50006c21c7c3431d30d9598f27cd91
* | | am 972628dc: am 5128e88e: Merge "Don\'t use reflection when generating the ↵Marcin Kosiba2014-09-112-104/+73
|\ \ \ | |/ / | | | | | | | | | | | | | | | onResourcesLoaded callback." into lmp-dev * commit '972628dc8c63b02b75f9e976b3ab67e3913da1a8': Don't use reflection when generating the onResourcesLoaded callback.
| * | Merge "Don't use reflection when generating the onResourcesLoaded callback." ↵Marcin Kosiba2014-09-112-104/+73
| |\ \ | | | | | | | | | | | | into lmp-dev
generated by cgit v1.1 at 2024-09-07 20:47:29 +0000