summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Add stub getThemeAttributeId() to BridgeTypedArrayDeepanshu Gupta2014-04-011-8/+15
| | | | | | | | | | The method is used to obtain theme attribute IDs for drawables for caching. The changeset also fixes some minor style issues found by code inspection. Change-Id: Ib5fe05511397b5ec7cb8e64f6b2769ec2c355f41
* Merge "Fix visitFieldInsn in layoutlib_create."Deepanshu Gupta2014-04-016-7/+36
|\
| * Fix visitFieldInsn in layoutlib_create.Deepanshu Gupta2014-03-316-7/+36
| | | | | | | | | | | | | | The bug caused some classes to be missed when computing the dependencies of the existing classes. Change-Id: I7285ff67e016ce5d73a8550501f49acc73cfadfa
* | Add missing dependency in layoutlib build fileDeepanshu Gupta2014-03-311-0/+1
|/ | | | | | Add missing dependency on built_ext_data Change-Id: I4e7cca7f6cbc7f5b7416ac9b85a9aec01e61ecd4
* Uses VMRuntime.newUnpaddedArray for ideal array sizesAdam Lesinski2014-03-271-56/+8
| | | | | | Bug:13028925 Change-Id: I0a9301248b10a339afbdc5e4ffe3310ac4fa1fb7
* Shared library resource supportAdam Lesinski2014-03-259-19/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Shared libraries can now export resources for applications to use. Exporting resources works the same way the framework exports resources, by defining the public symbols in res/values/public.xml. Building a shared library requires aapt to be invoked with the --shared-lib option. Shared libraries will be assigned a package ID of 0x00 at build-time. At runtime, all loaded shared libraries will be assigned a new package ID. Currently, shared libraries should not import other shared libraries, as those dependencies will not be loaded at runtime. At runtime, reflection is used to update the package ID of resource symbols in the shared library's R class file. The package name of the R class file is assumed to be the same as the shared library's package name declared in its manifest. This will be customizable in a future commit. See /tests/SharedLibrary/ for examples of a shared library and its client. Bug:12724178 Change-Id: I60c0cb8ab87849f8f8a1a13431562fe8603020a7
* Fix build.Dianne Hackborn2014-03-241-1/+1
| | | | Change-Id: I1dd79e932a551bd537d2c71e8fca29a299c9312f
* Merge "Reduce warning verbosity in aapt"Adam Lesinski2014-03-214-92/+98
|\
| * Reduce warning verbosity in aaptAdam Lesinski2014-03-204-92/+98
| | | | | | | | | | | | | | | | - Attributed source of problems to the correct file. - Only verify string localizations against valid locales. Bug:13140015 Change-Id: I9dabc5efa0510649caee8af0c8ebb803d6f48269
* | Fixing yet another build breackageSvetoslav2014-03-201-36/+0
|/ | | | Change-Id: I83597d5433fc6cc380d5ec1dd6f78e115e76db5b
* Merge "Add native method delegates to layoutlib"Deepanshu Gupta2014-03-142-0/+13
|\
| * Add native method delegates to layoutlibDeepanshu Gupta2014-03-142-0/+13
| | | | | | | | | | | | | | | | | | | | | | Add delegates for Path.native_isConvex and ICU.getCurrencyNumericCode. The original methods were added in 5be83edd15e11420287cc0af93a95d5a6dfae68f and d627bd4525e41b0503f94c2887c3e01618c73105 respectively. TODO: Implement Path_Delegate.native_isConvex Change-Id: If1046467d3950ab6955c6b81383a60fd6bd03fd2
* | am 1abb7e0f: am 63938750: am c0232642: am 629daddd: Merge "Fix layoutlib build."Narayan Kamath2014-03-141-1/+1
|\ \ | |/ |/| | | | | * commit '1abb7e0f3920b31cf216b99fc83231d80dfa7ca4': Fix layoutlib build.
| * am c0232642: am 629daddd: Merge "Fix layoutlib build."Narayan Kamath2014-03-141-1/+1
| |\ | | | | | | | | | | | | * commit 'c0232642b74517aa2717673f0811ba65c620f491': Fix layoutlib build.
| | * Fix layoutlib build.Narayan Kamath2014-03-141-1/+1
| | | | | | | | | | | | | | | | | | Was using private data structures from libcore. Change-Id: I5bd43190081891659e18b5c871686e6078efcc81
| * | resolved conflicts for merge of c76345a3 to klp-modular-dev-plus-aospDeepanshu Gupta2014-03-112-4/+20
| |\ \ | | |/ | | | | | | Change-Id: Id0aae224e17651bc07aa3f5b1a06923603d025b8
| | * Merge "Fix the delegate method signatures in LayoutLib"Deepanshu Gupta2014-03-116-94/+46
| | |\
| | | * Fix the delegate method signatures in LayoutLibDeepanshu Gupta2014-03-056-94/+46
| | | | | | | | | | | | | | | | Change-Id: I262c285c1047958afdb024724959d5afb3552802
* | | | resolved conflicts for merge of 92860a74 to masterNarayan Kamath2014-03-101-52/+28
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I3036ef9f1251c756092dc5ee2c4fed8146855e1e
| * | | am bbf82665: am 6e2fb587: Merge "LP64: Make 9 patches architecture agnostic."Narayan Kamath2014-03-101-50/+25
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'bbf826659e8e5d0be683b2459207c495303d53b6': LP64: Make 9 patches architecture agnostic.
| | * | LP64: Make 9 patches architecture agnostic.Narayan Kamath2014-03-101-50/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Res_png_9patch struct had several pointer members whose size differed between 32 and 64 bit platforms. These members have been replaced by uint32_t offsets to serialized data. The serialized form for 9patches places a Res_png_9patch object at the beginning of serialized data, followed by int32_t arrays of xDivs, yDivs and colors. Note that these offsets are not strictly required, since they can be computed from the values of numXDivs, numYDivs & numColors, however they are called in tight loops so having them computed once is a beneficial. This change also removed the unused patch_equals function from aapt's Image.cpp. Change-Id: I3b9ac8ae5c05510d41377cae4dff1c69b40c2531
* | | | resolved conflicts for merge of a81ee86b to masterTim Kilbourn2014-03-071-9/+34
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I7be3a64261d2405eda55b43c02b47657f393c095
| * | | am b559b371: Merge "Dump leanback info in aapt dump badging." into ↵Tim Kilbourn2014-03-081-8/+32
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-dev * commit 'b559b37150d24411f0b5ef102ced8d5acf858a0e': Dump leanback info in aapt dump badging.
| | * \ \ Merge "Dump leanback info in aapt dump badging." into klp-modular-devTim Kilbourn2014-03-081-8/+32
| | |\ \ \
| | | * | | Dump leanback info in aapt dump badging.Tim Kilbourn2014-03-071-8/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Leanback launcher activities are reported, including the banner. Change-Id: Ifa496736ad3ba4239ec95e166768af895ff4dc53
* | | | | | am 71364f8c: am f5f4d930: am 74bebf6f: Exclude the host aapt and aidl from ↵Ying Wang2014-03-082-4/+4
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PDK build. * commit '71364f8c1e1bcc84375830dd5904dfe7cdfb5ed6': Exclude the host aapt and aidl from PDK build.
| * | | | | am 74bebf6f: Exclude the host aapt and aidl from PDK build.Ying Wang2014-03-082-4/+4
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '74bebf6faed2d34814ffc3d46664330ea568f7b2': Exclude the host aapt and aidl from PDK build.
| | * | | | Exclude the host aapt and aidl from PDK build.Ying Wang2014-03-072-4/+4
| | |/ / / | | | | | | | | | | | | | | | | | | | | Bug: 13028632 Change-Id: I0f774b19be77462d0fa271088a4a5a152729d13c
* | | | | am 4bd720c2: am a05e7526: am 9c6f41e3: am be7b8f4f: Merge "aidl: Support ↵David 'Digit' Turner2014-03-061-0/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | building with updated host sysroot." * commit '4bd720c2c63b2400437db971ac96616693a8fe3b': aidl: Support building with updated host sysroot.
| * | | | am 9c6f41e3: am be7b8f4f: Merge "aidl: Support building with updated host ↵David 'Digit' Turner2014-03-051-0/+2
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | sysroot." * commit '9c6f41e3eb2258d52480be04dd8916a10f8be8db': aidl: Support building with updated host sysroot.
| | * | | Merge "aidl: Support building with updated host sysroot."David 'Digit' Turner2014-03-051-0/+2
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | aidl: Support building with updated host sysroot.David 'Digit' Turner2014-03-051-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes tools/aidl/Type.cpp to compile with a more recent SDK host toolchain sysroot (that has not been submitted yet). The main issue is that the code uses ssize_t which is defined in <sys/types.h>, but didn't include the header directly. Apparently, this no longer compiles when using the Ubuntu 10.04 libc6-dev headers (the current SDK toolchain is based on Ubuntu 8.04), so perform an explicit include to fix this. NOTE: This doesn't break the Windows SDK build. Change-Id: Idcacf8f8d1c606b39bf8aa75ab409aa0c2a3cd5a
* | | | | am 04c5bcf2: am 160c39d8: am 26026c62: am dd72b6e7: Merge "Fix indirect ↵Ying Wang2014-03-011-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | misuse of ." * commit '04c5bcf2bb82099fa8c02dd9a38ccac36d326373': Fix indirect misuse of $(my-dir).
| * | | | am 26026c62: am dd72b6e7: Merge "Fix indirect misuse of ."Ying Wang2014-03-011-1/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '26026c62788f508f9de0df608dd7043e7d1399f6': Fix indirect misuse of $(my-dir).
| | * | | Fix indirect misuse of $(my-dir).Ying Wang2014-02-281-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I20a98a8e1378da3a53e6a6d599c8fc0100f7f87a
* | | | | am b2334254: am ec84ada6: am 5e5602da: am 0c72b769: Merge "Update layoutlib ↵Xavier Ducrohet2014-02-271-5/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | method for SystemClock" * commit 'b2334254ef497e0dcda68d257c096516c77679a4': Update layoutlib method for SystemClock
| * | | | am 5e5602da: am 0c72b769: Merge "Update layoutlib method for SystemClock"Xavier Ducrohet2014-02-271-5/+0
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '5e5602da5fa9cd2e1d135b2310af2a8352f65e8d': Update layoutlib method for SystemClock
| | * | | Update layoutlib method for SystemClockDeepanshu Gupta2014-02-241-5/+0
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Update layoutlib to reflect changes from http://android-review.googlesource.com/83061/ Change-Id: If7326f3af2a97271ad1465382944e1f078b965d8
| * | | am 9edf7a11: am 2cb9147f: am 55542ee6: am 3e637042: Merge "Set default text ↵Xavier Ducrohet2014-02-201-0/+3
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | style in layoutlib as NORMAL [DO NOT MERGE]" into klp-dev * commit '9edf7a1159b528afa056e0d61ee4487ed310fe4c': Set default text style in layoutlib as NORMAL [DO NOT MERGE]
| | * | am 2cb9147f: am 55542ee6: am 3e637042: Merge "Set default text style in ↵Xavier Ducrohet2014-02-201-0/+3
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | layoutlib as NORMAL [DO NOT MERGE]" into klp-dev * commit '2cb9147fc49e6474eaf30fd833e43df10e42b899': Set default text style in layoutlib as NORMAL [DO NOT MERGE]
| | | * \ am 55542ee6: am 3e637042: Merge "Set default text style in layoutlib as ↵Xavier Ducrohet2014-02-201-0/+3
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NORMAL [DO NOT MERGE]" into klp-dev * commit '55542ee6449bd580f61bc005726b5c87773fbe25': Set default text style in layoutlib as NORMAL [DO NOT MERGE]
| | | | * \ Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into ↵Xavier Ducrohet2014-02-201-0/+3
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | klp-dev
| | | | | * | Set default text style in layoutlib as NORMAL [DO NOT MERGE]Deepanshu Gupta2014-02-191-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a style doesn't specify text style (normal/bold/italic/bold-italic) then default to normal instead of throwing an error. Bug: http://b.android.com/61358 Change-Id: I0138c73807a5ff6e4d938a99ece3044333110aa1 (cherry picked from commit 0acfb16dcd95468fe032204f54618e86becfd1eb)
| * | | | | | am 65521c3c: am ca4b9a77: am e92c8542: am 01825b7a: Fix sans-serif-thin and ↵Deepanshu Gupta2014-02-201-3/+5
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sans-serif-light fonts in layoutlib. [DO NOT MERGE] * commit '65521c3cf169808cd02ce09a7344bc633d51c1fc': Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
| | * | | | | am ca4b9a77: am e92c8542: am 01825b7a: Fix sans-serif-thin and ↵Deepanshu Gupta2014-02-201-3/+5
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sans-serif-light fonts in layoutlib. [DO NOT MERGE] * commit 'ca4b9a77e7d20703287b33b203b2582bd43f7792': Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
| | | * | | | am e92c8542: am 01825b7a: Fix sans-serif-thin and sans-serif-light fonts in ↵Deepanshu Gupta2014-02-201-3/+5
| | | |\ \ \ \ | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | layoutlib. [DO NOT MERGE] * commit 'e92c8542a5cf1160a1b701b9f176af64ba46d68d': Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
| | | | * | | Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]Deepanshu Gupta2014-02-191-3/+5
| | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For these font families, text was always rendered as italic. This changeset fixes the issue. Bug: http://b.android.com/57221 Change-Id: Ic8a299bd1e555f5bb914cd3d2fe72917ec7f471a (cherry picked from commit e327212adde1136807bbdf052e8cc3861f8a6aba)
| * | | | | am 28879bbf: am be57fca4: Merge "Extended locales in AAPT / AssetManager."Narayan Kamath2014-02-178-224/+522
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | * commit '28879bbfe89dc4bf2067a7183975ecffb82f68e6': Extended locales in AAPT / AssetManager.
| | * | | | Extended locales in AAPT / AssetManager.Narayan Kamath2014-02-148-224/+522
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support 3 letter language codes, script codes & variants. The bulk of the changes are related to the implementation of command line filtering of locales etc. The previous code assumed that the value of each "axis" (locale, density, size etc.) could be represented by a 4 byte type. This is no longer the case. This change introduces a new class, AaptLocaleValue which holds a (normalized) locale parsed from a directory name or a filter string. This class takes responsibility for parsing locales as well as writing them to ResTable_config structures, which is their representation in the resource table. This includes minor changes at the java / JNI level for AssetManager. We now call locale.toLanguageTag() to give the native layer a well formed BCP-47 tag. I've removed some duplicated parsing code in AssetManager.cpp and replaced them with functions on ResTable_config. The native getLocales function has been changed to return well formed BCP-47 locales as well, so that the corresponding java function can use Locale.forLanguageTag to construct a Locale object out of it. Finally, this change introduces default and copy constructors for ResTable_config to prevent having to memset() the associated memory to 0 on every stack allocation. (cherry-picked from commit 91447d88f2bdf9c2bf8d1a53570efef6172fba74) Change-Id: I1b43086860661012f949fb8e5deb7df44519b854
* | | | | | Add tests to the layoutlib eclipse project.Deepanshu Gupta2014-02-271-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Specify the test folder in the layoutlib/bridge eclipse project. Also add the sourcepath for layoutlib-api-prebuilt.jar Change-Id: I194ed182618e564388d6df645e2de7f59897fa1e
generated by cgit v1.1 at 2025-01-08 08:09:56 +0000