drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
221,423 Commits 1 Branch 0 Tags
Commit Graph

707 Commits

Author SHA1 Message Date
Tor Norbye
b3559643b9 Don't set modification times in aapt zip entries 
Use a modification timestamp of 0 for all files
inside the zip archive to make the build repeatable.

Change-Id: Ie6e57329469b99c6f93cb0a6083e0c402be99815
 2015-10-30 20:00:13 -07:00
Adam Lesinski
09ffc62fdb Merge "AAPT: Don't try to rewrite String constants when loading shared lib" 2015-09-11 01:48:05 +00:00
Adam Lesinski
eed585821a AAPT: Don't try to rewrite String constants when loading shared lib 
Bug:20138255
Change-Id: Ieb6a31ee9afe0de3d1c99b21f78aa48fe07015c6
 2015-09-10 18:43:34 -07:00
Tao Bai
ab5bca1519 Merge "Load app resource as shared library." 2015-09-09 16:08:12 +00:00
Tao Bai
a6d7e3fb9c Load app resource as shared library. 
- Added aapt command line flag --app-as-shared-lib to build app resources
  that could be loaded as shared lib at runtime.
- Added new method AssetManager.addAssetPathAsSharedLibrary() to load an
  app resource as shared library.

Bug 22487604

Change-Id: Ib9b33c35f9c2b7129f3ba205de03d4564623ea39
 2015-09-08 18:48:42 -07:00
Dan Willemsen
13786e281e am 60dd5d59: Merge "Remove USE_MINGW, whitelist windows modules" 
* commit '60dd5d5966ebe993f5a81c46d9dea62c207abfd3':
  Remove USE_MINGW, whitelist windows modules
 2015-09-01 16:37:10 +00:00
Dan Willemsen
4aa679ff96 Remove USE_MINGW, whitelist windows modules 
Bug: 23566667
Change-Id: Ie6b8c51e2b6d6273f99f4e361c440136d7c6915c
 2015-08-28 15:28:26 -07:00
Elliott Hughes
84d4917c75 am 12cf0f9c: am eba23aaa: Merge "Replace HAVE_MS_C_RUNTIME with _WIN32 in frameworks/base/tools." 
* commit '12cf0f9c4cf8e6aed738da7349f556bd716ec09e':
  Replace HAVE_MS_C_RUNTIME with _WIN32 in frameworks/base/tools.
 2015-08-17 21:15:40 +00:00
Elliott Hughes
bda7780dae am 12cf0f9c: am eba23aaa: Merge "Replace HAVE_MS_C_RUNTIME with _WIN32 in frameworks/base/tools." 
* commit '12cf0f9c4cf8e6aed738da7349f556bd716ec09e':
  Replace HAVE_MS_C_RUNTIME with _WIN32 in frameworks/base/tools.
 2015-08-17 21:15:35 +00:00
Elliott Hughes
e17788ceff Replace HAVE_MS_C_RUNTIME with _WIN32 in frameworks/base/tools. 
Change-Id: Ideef62acbf53a442167c9b8038021affffef9e8a
 2015-08-17 12:41:46 -07:00
Adam Lesinski
f473084a4a am 6df21b51: am 085a6b42: am 89a3c5ad: am 0cd143ad: Merge "AAPT: Fix regression in resource versioning" into mnc-dev 
* commit '6df21b51b118281a46cfd3c13716718040a33aea':
  AAPT: Fix regression in resource versioning
 2015-08-16 02:54:54 +00:00
Adam Lesinski
9a9fd61e0b am 0cd143ad: Merge "AAPT: Fix regression in resource versioning" into mnc-dev 
* commit '0cd143adae642465a26a7eaac96030bb18826e94':
  AAPT: Fix regression in resource versioning
 2015-08-14 20:51:21 +00:00
Adam Lesinski
beb9e33bfb AAPT: Fix regression in resource versioning 
With a set of resources with the following configurations:

()
(land)

the regression caused any resources that needed to be versioned in configuration () to be lost.

Bug:23038206
Change-Id: I2f1b0313fb780ac241e7aaa487cb37dfb79c36aa
 2015-08-14 13:41:46 -07:00
Elliott Hughes
344d347af2 am 39669d7f: am 6fdc6333: Merge "Lose HAVE_ANDROID_OS from frameworks/base." 
* commit '39669d7f6b8fedef3468ab3d417c93a21df528af':
  Lose HAVE_ANDROID_OS from frameworks/base.
 2015-08-12 23:28:30 +00:00
Elliott Hughes
17b4be07fe am 39669d7f: am 6fdc6333: Merge "Lose HAVE_ANDROID_OS from frameworks/base." 
* commit '39669d7f6b8fedef3468ab3d417c93a21df528af':
  Lose HAVE_ANDROID_OS from frameworks/base.
 2015-08-12 23:21:56 +00:00
Elliott Hughes
ba3fe56edc Lose HAVE_ANDROID_OS from frameworks/base. 
Change-Id: I713881fdbaec7cbbb5e7f2f4be6f9b8be3d2ca4e
 2015-08-12 14:49:53 -07:00
Adam Lesinski
a5c9d829ce am 7fa83d26: am b9904daa: am 15724ffc: am e3b0119f: Merge "AAPT: Fix resource versioning" into mnc-dev 
* commit '7fa83d269b6f84ae32ddc94731a44acb6d66c4c1':
  AAPT: Fix resource versioning
 2015-07-31 00:55:20 +00:00
Adam Lesinski
10730b6907 am e3b0119f: Merge "AAPT: Fix resource versioning" into mnc-dev 
* commit 'e3b0119f79d11744a7f590510b184feef0f45894':
  AAPT: Fix resource versioning
 2015-07-31 00:35:12 +00:00
Elliott Hughes
0e252720b2 am e528f048: am 84a04d52: Merge "Move frameworks/base/tools/ off AndroidConfig.h." 
* commit 'e528f048689868a2d4dfdf23b553fe536acd15cd':
  Move frameworks/base/tools/ off AndroidConfig.h.
 2015-07-30 00:16:28 +00:00
Elliott Hughes
e62867247d am e528f048: am 84a04d52: Merge "Move frameworks/base/tools/ off AndroidConfig.h." 
* commit 'e528f048689868a2d4dfdf23b553fe536acd15cd':
  Move frameworks/base/tools/ off AndroidConfig.h.
 2015-07-30 00:15:45 +00:00
Elliott Hughes
9ec96f9756 Move frameworks/base/tools/ off AndroidConfig.h. 
Change-Id: Ibc7abb67a56945a9618bc91ccdbebe4c806879a5
 2015-07-29 14:35:18 -07:00
Adam Lesinski
f45d2fad2e AAPT: Fix resource versioning 
Resource generation was greedy, so when an attribute with sdk level 21 was used in a resource
with v1, and a different attribute with sdk level 21 was used in a resource with v11,
a v21 resource would be synthesized, but it would contain the attribute from v1 instead of v11.

This change fixes the issue, having the higher versioned resource take precedence.

Bug:22793816
Change-Id: Ia687f56b0d9969e424111477d55d9804255b22e9
 2015-07-28 12:26:57 -07:00
Colin Cross
a083ef9a7b am bbcc914b: am 01efd7e8: Merge "Use build_number from file" 
* commit 'bbcc914b18a5b2ea57e25e6e79336c5c75d49421':
  Use build_number from file
 2015-07-23 19:11:22 +00:00
Colin Cross
6f1e3c56a7 am bbcc914b: am 01efd7e8: Merge "Use build_number from file" 
* commit 'bbcc914b18a5b2ea57e25e6e79336c5c75d49421':
  Use build_number from file
 2015-07-23 19:01:39 +00:00
Colin Cross
01efd7e820 Merge "Use build_number from file" 2015-07-23 18:23:06 +00:00
Elliott Hughes
1c6d9005d3 am f9a82218: am 86d5fc28: Merge "aapt: expat exports its header files now." 
* commit 'f9a8221810a0b5aaa4050becaa0aa9d492035ff3':
  aapt: expat exports its header files now.
 2015-07-22 01:26:20 +00:00
Elliott Hughes
b48adad2ed aapt: expat exports its header files now. 
(cherrypick of 51348d2007b801c7bd7350f72e2300f1a5a41dd1)
Change-Id: Iddf0133919d38fc896f97c6796f8228a6decf174
 2015-07-21 17:25:01 -07:00
Colin Cross
06e04f7671 Use build_number from file 
Improve incremental ninja builds by keeping the command line the same
across builds.

Change-Id: If9dfcee74a4d282c183f9669e14a89104c115a71
 2015-07-21 12:55:13 -07:00
Elliott Hughes
4fafd67211 aapt: expat exports its header files now. 
Change-Id: Iddf0133919d38fc896f97c6796f8228a6decf174
(cherry picked from commit 51348d2007b801c7bd7350f72e2300f1a5a41dd1)
 2015-07-21 18:45:11 +00:00
Elliott Hughes
37b894c9f8 am 94fed352: am 188af044: Merge "Revert "frameworks/base: libexpat now exports its headers."" 
* commit '94fed352f6f4dc1c53ea69a0cee3944f55b92d99':
  Revert "frameworks/base: libexpat now exports its headers."
 2015-07-11 02:03:58 +00:00
Elliott Hughes
1bd6d9c979 am 94fed352: am 188af044: Merge "Revert "frameworks/base: libexpat now exports its headers."" 
* commit '94fed352f6f4dc1c53ea69a0cee3944f55b92d99':
  Revert "frameworks/base: libexpat now exports its headers."
 2015-07-11 01:39:45 +00:00
Elliott Hughes
ba7e659b55 Revert "frameworks/base: libexpat now exports its headers." 
This reverts commit 2f31b66c04b1e80fd039418edf41e74f67b68143.

Change-Id: Ib4ce610d1767db5c72c54d33520e8bdf50171a18
 2015-07-11 01:07:39 +00:00
Elliott Hughes
3108dabf05 am 4d4c4507: am 220b61f1: Merge "frameworks/base: libexpat now exports its headers." 
* commit '4d4c45071b56089112bcfc687d635b966b810f4b':
  frameworks/base: libexpat now exports its headers.
 2015-07-11 01:04:37 +00:00
Elliott Hughes
aa4a994d5c am 4d4c4507: am 220b61f1: Merge "frameworks/base: libexpat now exports its headers." 
* commit '4d4c45071b56089112bcfc687d635b966b810f4b':
  frameworks/base: libexpat now exports its headers.
 2015-07-11 01:02:59 +00:00
Elliott Hughes
2f31b66c04 frameworks/base: libexpat now exports its headers. 
Change-Id: Iaba3d57db18ebdd89e4a993436e9bf844722ff87
 2015-07-10 11:12:22 -07:00
Igor Viarheichyk
729ffa299c ICU format support for pseudolocalizes. 
Custom parser can handle nested ICU messages even if they
are split into multiple fragments. Code reworked to encapsulate
all pseudolocalization logic in Pseudolocalizer and PseudoMethods
classes. To minimize a changelist size, some static functions
remained. Fake BiDi pseudolocalization method is reimplemented
to handle word boundaries correctly. Unit tests added.

(cherry picked from commit cbb1e676b56677ae3585c067f29646dddffb4857)

bug: 22060509

Change-Id: I11968d81984d99501a4d9334ff2e7453a1eb7a00
 2015-06-25 09:49:43 +01:00
Narayan Kamath
dde6069243 am 3277710c: am a121d34c: Merge "ICU format support for pseudolocalizes." 
* commit '3277710c10e7b2dcd06bdc7f649346cd302fb3ac':
  ICU format support for pseudolocalizes.
 2015-06-09 10:54:52 +00:00
Igor Viarheichyk
cbb1e676b5 ICU format support for pseudolocalizes. 
Custom parser can handle nested ICU messages even if they
are split into multiple fragments. Code reworked to encapsulate
all pseudolocalization logic in Pseudolocalizer and PseudoMethods
classes. To minimize a changelist size, some static functions
remained. Fake BiDi pseudolocalization method is reimplemented
to handle word boundaries correctly. Unit tests added.

Change-Id: I9fb4baf4e3123df5dd6d182cca02bb7b0489ca71
 2015-06-09 11:28:20 +01:00
Adrian Roos
5892248580 aapt: add option for stricter symbol generation 
Adds an option that prevents generating java symbols for string
resources that don't have a default localization.

Bug: 21537397
Change-Id: Ifafa942b24d5cdbed93651cde363e859be13d395
 2015-06-02 02:55:52 +00:00
Adam Lesinski
2738c96d99 Add -round and -notround qualifier to android runtime/aapt 
The round qualifier denotes a device with a screen shape that
is round. The qualifier shows up after the 'long/notlong' qualifier
and before the orientation 'port/land/square' qualifiers.

Change-Id: I3044258b2703a9165694b79725bade770fa6cea1
 2015-05-15 15:10:58 -07:00
Chih-Hung Hsieh
9a59a991dd Remove unused aapt target. 
BUG: 20765163
Change-Id: I13f36f76541216c5c1c20ae8866e09038e08e6f8
(cherry picked from AOSP commit 97627314a4d3e114afe3dbd764a51523e9f0b787)
 2015-05-06 00:13:37 +00:00
Chih-Hung Hsieh
97627314a4 Remove unused aapt target. 
BUG: 20765163
Change-Id: I13f36f76541216c5c1c20ae8866e09038e08e6f8
 2015-05-04 15:49:46 -07:00
Narayan Kamath
bb4ed9aa3a am 815d9bb1: Merge "Add a static dependency on libbase." 
* commit '815d9bb178a0488ed1579cd230d447630ad0891b':
  Add a static dependency on libbase.
 2015-04-29 14:38:15 +00:00
Narayan Kamath
9c8ba9666d Add a static dependency on libbase. 
Used by libziparchive.

Change-Id: I120494b620c72b36a725b01f1f274f5dc862a9a3
 2015-04-29 14:07:41 +00:00
Adam Lesinski
6e46056abc AAPT: Add flag to disable versioning of vector related XML 
AAPT automatically versions XML files according to the SDK level
in which their attributes were introduced. Support libraries
know how to handle resources built against newer SDKs, so offer
the option to disable some of the automatic versioning, namely
vectors.

Bug:19336994
Change-Id: I9f9d0ae8f2a0c28404f82e27de416f80e38493c9
 2015-04-21 14:27:02 -07:00
Colin Cross
88fa96c758 am 106f83ee: am 4cead39a: am 1be312df: Merge "Re-enable -Wall and -Werror that were lost in a merge" 
* commit '106f83ee9cc145a6421d21067c44b513cc148e80':
  Re-enable -Wall and -Werror that were lost in a merge
 2015-04-09 01:44:38 +00:00
Colin Cross
1be312dfb0 Merge "Re-enable -Wall and -Werror that were lost in a merge" 2015-04-09 00:49:56 +00:00
Colin Cross
01f185633c Re-enable -Wall and -Werror that were lost in a merge 
-Wall and -Werror were lost during a merge when they were added to
aaptCFLAGS instead of aaptCFlags.  Fix the typo, and the warnings
that crept in while it was disabled.

Change-Id: Ib944b8d6149278e4f3861c1acac277bcd95cc7c2
 2015-04-08 17:48:23 -07:00
Elliott Hughes
dda35c37ea am 66d94512: am dbb5f5d6: am efcbaec1: Merge "Only Windows doesn\'t have %zd." 
* commit '66d9451273c4a3775b6b63a0e4b7027bd2eae65d':
  Only Windows doesn't have %zd.
 2015-04-03 20:58:25 +00:00
Elliott Hughes
b12f2410c7 Only Windows doesn't have %zd. 
Change-Id: I0e4b0fdc61641c5ecb724fd096bd2315dcf8ed4a
 2015-04-03 12:56:45 -07:00