• Home
  • History
  • Annotate
  • only in /frameworks/base/tools/aapt2/data/
History log of /frameworks/base/tools/aapt2/data/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
6cc479b76e9e2e8858434302e1ef2d514ed1b0ec 13-Jun-2015 Adam Lesinski <adamlesinski@google.com> AAPT2: Remove the need for specifying package name in compile phase

The compile phase doesn't use the AndroidManifest, so we had to specify the
package name on the command line.

We can omit the package name, since we don't resolve external references
in the compile phase. Packages that reference the current package will be encoded
with no package name. When loaded by the link phase, the package name will be supplied
and all the references with no package name will use that one.

Change-Id: I9fe4902b747b06899b45c968f30ba1aa05c5cd69
akefile
ib/Makefile
a1ad4a812a87642ad259ff4478159e8cc8194680 08-Jun-2015 Adam Lesinski <adamlesinski@google.com> AAPT2: Proguard rules generation added.

Change-Id: Ifbe79516cd9a1ade471e211a259301c63b62ac67
ndroidManifest.xml
akefile
es/layout/main.xml
8c831ca87bb7c8699b2a5cb34b8d35deedf9ce4e 21-May-2015 Adam Lesinski <adamlesinski@google.com> AAPT2: Add manifest merging

Now that AAPT2 is library-aware, it needs to take care of
all library related work, including merging manifests.
The logic was taken from the current Java ManifestMerger.

Change-Id: Id93f713f27ae8617922bf89e325e45be9f863c06
ib/AndroidManifest.xml
39c353a6caada777348c14f6dc9abee2d4d9a3be 15-May-2015 Adam Lesinski <adamlesinski@google.com> AAPT2: Fix layout versioning

Change-Id: I37190cf8a1f0a81c068aeb2b5326b3b3080f75a5
akefile
6d8e4c48f94f36963a25e357ff960ee519cf0e1b 01-May-2015 Adam Lesinski <adamlesinski@google.com> AAPT2: Add option to generate static library

Difference between normal app and static library is that
the R file uses non-final fields, and the extra chunks added
by AAPT2 remain in the final APK.

Change-Id: I61416387ca9bb3c21857ff7cfab5847ac3edf57a
ib/Makefile
24aad163bc88cb10d2275385e9afc3de7f342d65 25-Apr-2015 Adam Lesinski <adamlesinski@google.com> Add namespace handling in attribute values

Previously, you could only reference namespace prefixes in attribute names:

<View xmlns:appcompat="http://schemas.android.com/apk/res/android.support.v7.appcompat"
appcompat:name="hey"
...

Now you can also reference them in resource names within an attribute value:

...
android:text="@appcompat:string/confirm"
...

Which will be treated as "@android.support.v7.appcompat:string/confirm".

Change-Id: Ib076e867a990c80cf877a704eb77cd1ef0b23b52
ib/res/values/styles.xml
es/layout/main.xml
es/values/styles.xml
d5c4f8723c2b2c85b588fa07a5d4e7afb671d257 21-Apr-2015 Adam Lesinski <adamlesinski@google.com> Properly mangle file names

Change-Id: I49c0f82e8c06f056198eb64b8369d83403b74321
akefile
ib/Makefile
ib/res/layout/main.xml
ib/res/raw/hello.txt
769de98f2dd41bfe39a1c9f76aefd1ad58942733 11-Apr-2015 Adam Lesinski <adamlesinski@google.com> AAPT2: Add library support

Change-Id: I307f56d9631784ab29ee4156d94886f9b2f25b30
akefile
ib/AndroidManifest.xml
ib/Makefile
ib/res/values/styles.xml
es/values/styles.xml
c7e2432dec68431d4dd9a8466f47a5761197d00a 11-Apr-2015 Adam Lesinski <adamlesinski@google.com> AAPT2: Create Makefile

Makefile that uses zip for assembling the final APK. This is temporary and
helps speed up the rest of development.

Has to add a new 'manifest' phase that simply compiles the AndroidManifest.xml.
Manifests are handled differently and must be validated.

Change-Id: I0d8255b3ad0d0b0a322683077e3331ca93e37fa0
akefile
4d3a987694f6f6b95d8a0f1542618223ce253e6d 10-Apr-2015 Adam Lesinski <adamlesinski@google.com> AAPT2: Adding basic binding support

This is incomplete. Still requires:

- filling in layout information in the resulting .bind.xml
- processing elements with <view class=""/>
- processing imports

Change-Id: Ie5d4c5e6435591bbed3248129a548736244894eb
es/layout/main.xml
98aa3ad6e46e3b0270785c8b3f9798e37e8af140 06-Apr-2015 Adam Lesinski <adamlesinski@google.com> Add PNG and 9-patch support

Change-Id: I9ecdfdf82b82d59084490da518e167e256afd5f2
es/drawable/icon.png
es/drawable/test.9.png
6f6ceb7e1456698b1f33e04536bfb3227f9fcfcb 14-Nov-2014 Adam Lesinski <adamlesinski@google.com> AAPT2

First checking of AAPT2. The individual phases of AAPT2 work, but there
are some missing pieces.

For early testing we are missing:
- Need to properly mark file references and include them in package
- Need to package into zip

Final AAPT for apps we are missing:
- Need to crush PNGs
- Need to parse 9-patches
- Need to validate all of AndroidManifest.xml
- Need to write align method to align resource tables for splits.

Final AAPT for apps + system we are missing:
- Need to handle overlays
- Need to store comments for R file
- Need to handle --shared-lib (dynamic references too).

New AAPT features coming:
- Need to import compiled libraries
- Name mangling
- R file generation for library code

Change-Id: I95f8a63581b81a1f424ae6fb2c373c883b72c18d
ndroidManifest.xml
es/drawable/image.xml
es/layout/main.xml
es/values-v4/styles.xml
es/values/colors.xml
es/values/styles.xml
es/values/test.xml
esources.arsc
esources_base.arsc
esources_hdpi.arsc