leozwang
3240483383
Remove bcc from generic_no_telephony.mk.
...
bcc was added into core_minimal.mk.
Change-Id: I29fa6eb3df0dada609e2f6b3e28ffd08d13c6afc
2014-07-14 13:54:22 -07:00
leozwang
38bbc70d04
Add bcc into /system/bin.
...
Bug: 16161758
Change-Id: I492f6780ecf7d18f291532fc934a80ff7ac643cf
(cherry picked from commit 1bb19d3262
)
2014-07-14 17:06:32 +00:00
Jeff Brown
5d0da1f959
Build docs for android-support-media-protocols.jar.
...
Change-Id: Ib98b1cf3c4ab04594788f5182e616987a64b55be
2014-07-14 04:08:15 -07:00
The Android Automerger
263bce3e2a
"LDW13B"
2014-07-13 13:24:05 -07:00
Baligh Uddin
af0aa3ca6d
Fix Tamil country code. ta_TN should be ta_IN
...
Change-Id: I177bc5ba09f0c529409c5a81d67b6dc61d5afdf6
Bug: 16234964
2014-07-12 19:28:17 +00:00
Dan Albert
7992590462
am 202c962b
: am 8f73aeea
: am 183f90f4
: am 3ffcf184
: Merge "Remove -Bsymbolic from builds."
...
* commit '202c962b0500be38014904c96e740b3e63ce8ece':
2014-07-11 17:46:56 +00:00
Ying Wang
5df55f3db8
am c44f69a3
: am 9e00b638
: am cd02c025
: am 979d578e
: Merge "Fix host java doc by referring to the correct classpath."
...
* commit 'c44f69a38f76415d3f11fe7c3331ea7515fb479d':
2014-07-11 17:32:53 +00:00
Dan Albert
202c962b05
am 8f73aeea
: am 183f90f4
: am 3ffcf184
: Merge "Remove -Bsymbolic from builds."
...
* commit '8f73aeea87f96d715ca2f39a35fd73986feecceb':
Remove -Bsymbolic from builds.
2014-07-11 17:29:00 +00:00
Ying Wang
c44f69a38f
am 9e00b638
: am cd02c025
: am 979d578e
: Merge "Fix host java doc by referring to the correct classpath."
...
* commit '9e00b6385c5805743f5beaa22dffce021342ed5e':
Fix host java doc by referring to the correct classpath.
2014-07-11 16:18:43 +00:00
Raph Levien
fed4c5ca5a
Merge "Add Zopfli-recompress option to zipalign"
2014-07-10 20:54:59 +00:00
Geremy Condra
557e9c977f
Merge "Add support for signed boot images."
2014-07-10 20:49:26 +00:00
Geremy Condra
740b6636cc
Add support for signed boot images.
2014-07-10 14:53:08 -07:00
Geremy Condra
f5ca5c4b0d
Merge "Revert "Add support for signed boot images.""
2014-07-10 20:49:26 +00:00
Geremy Condra
ac880493e2
Revert "Add support for signed boot images."
...
This reverts commit 7e2c5ed84f
.
Change-Id: Id90e3b2d986fac3ac9b2748194747af712ac4ab1
2014-07-10 21:29:24 +00:00
Geremy Condra
7e2c5ed84f
Add support for signed boot images.
...
Change-Id: Ib08fc700f626d838efa9a543316afbcd4b782525
2014-07-10 12:23:25 -07:00
Geremy Condra
2987048f81
Merge "Add support for signed boot images."
2014-07-10 17:35:05 +00:00
Colin Cross
5c75fa6561
am 50fb938f
: am ec5563b5
: Merge "build: fix host dex2oat runtime args"
...
* commit '50fb938f79387ab92ed3b64194da47b146d74db6':
build: fix host dex2oat runtime args
2014-07-10 09:43:33 +00:00
Colin Cross
50fb938f79
am ec5563b5
: Merge "build: fix host dex2oat runtime args"
...
* commit 'ec5563b55146372fe33ebd4fc13661d811b77323':
build: fix host dex2oat runtime args
2014-07-10 06:33:08 +00:00
Paul Jensen
41c124b30e
Merge "Add app to handle captive portal login."
2014-07-10 00:46:47 +00:00
Paul Jensen
d42ae84863
Add app to handle captive portal login.
...
This app is only used if no other app handles the broadcast to perform captive
portal login.
Bug:15409233
Bug:15409354
Change-Id: Ie240d7eac4bdbab8cc7578782bd72d8b26de7951
2014-07-10 17:18:35 +00:00
Colin Cross
fddd992d90
am 5c75fa65
: am 50fb938f
: am ec5563b5
: Merge "build: fix host dex2oat runtime args"
...
* commit '5c75fa6561b7b58ae8f024bc6936433242cc9b43':
build: fix host dex2oat runtime args
2014-07-10 11:05:13 +00:00
Ying Wang
cab3ac84c2
am 094ab99f
: am bc3b9801
: am c4954f39
: Merge "Don\'t enable LOCAL_DEX_PREOPT for apks outside system.img"
...
* commit '094ab99f27e68cfb6a39c2355be377e27bd6df72':
Don't enable LOCAL_DEX_PREOPT for apks outside system.img
2014-07-10 00:42:53 +00:00
Ying Wang
703709dba4
am baad790d
: am f27e3fb4
: am c35cc93d
: Merge "Allow symlinks to device or vendor tree in envsetup.sh."
...
* commit 'baad790de671f680d6584edc4712a9cde823f49c':
Allow symlinks to device or vendor tree in envsetup.sh.
2014-07-10 00:42:52 +00:00
Ying Wang
094ab99f27
am bc3b9801
: am c4954f39
: Merge "Don\'t enable LOCAL_DEX_PREOPT for apks outside system.img"
...
* commit 'bc3b98012dc77474d146db7747c7f33c50fe31c0':
Don't enable LOCAL_DEX_PREOPT for apks outside system.img
2014-07-10 00:16:48 +00:00
Ying Wang
baad790de6
am f27e3fb4
: am c35cc93d
: Merge "Allow symlinks to device or vendor tree in envsetup.sh."
...
* commit 'f27e3fb4cf1d51f3abd5261d5626997c71df22b7':
Allow symlinks to device or vendor tree in envsetup.sh.
2014-07-10 00:16:48 +00:00
Ying Wang
bc3b98012d
am c4954f39
: Merge "Don\'t enable LOCAL_DEX_PREOPT for apks outside system.img"
...
* commit 'c4954f392e94f1877ab77ccef725a26c5d549ed1':
Don't enable LOCAL_DEX_PREOPT for apks outside system.img
2014-07-10 00:08:18 +00:00
Ying Wang
f27e3fb4cf
am c35cc93d
: Merge "Allow symlinks to device or vendor tree in envsetup.sh."
...
* commit 'c35cc93d3b12880ae4de00ae9ef867ab91dbc412':
Allow symlinks to device or vendor tree in envsetup.sh.
2014-07-10 00:08:13 +00:00
Ying Wang
c4954f392e
Merge "Don't enable LOCAL_DEX_PREOPT for apks outside system.img"
2014-07-09 21:46:48 +00:00
Ying Wang
c35cc93d3b
Merge "Allow symlinks to device or vendor tree in envsetup.sh."
2014-07-09 21:35:35 +00:00
Ying Wang
506410a549
Allow symlinks to device or vendor tree in envsetup.sh.
...
Change-Id: I1190a0b1c84fa17b3692427eb6071ffbe84bc529
2014-07-09 15:37:34 -07:00
Ying Wang
edfd55ae99
Don't enable LOCAL_DEX_PREOPT for apks outside system.img
...
Bug: 15621103
Change-Id: If267a4aaad17b66d9779169237e06d65d67f088f
2014-07-09 10:57:32 -07:00
Brian Carlstrom
b1c9734b68
am ef0b6e0c
: am 8a749606
: am 02a5b517
: Merge "Make dex2oat heap size product configurable [build]"
...
* commit 'ef0b6e0c19eb37f4fbc42491771611e247168519':
Make dex2oat heap size product configurable [build]
2014-07-09 15:07:13 +00:00
Ying Wang
26dbc3e6e4
am d3b5d574
: am ce40d5f9
: am bc7501e1
: Merge "More consistent use of 64-bit build variable."
...
* commit 'd3b5d574defd565d6e810cbb86e3943837f94065':
More consistent use of 64-bit build variable.
2014-07-09 15:07:12 +00:00
Deepanshu Gupta
4221bb7c4a
am 042c8a06
: (-s ours) am f0200e87
: am 72146221
: am 0b3aa00e
: am da111964
: (-s ours) am d23dcdf1
: am a0130a4d
: am 9915a60c
: (-s ours) am 1bb64302
: am 1699a434
: am 075f7751
: Integrate build_font.py [DO NOT MERGE]
...
* commit '042c8a06c1fce45856d49ae73c06f1eb7043669f':
Integrate build_font.py [DO NOT MERGE]
2014-07-09 14:42:43 +00:00
Colin Cross
ec5563b551
Merge "build: fix host dex2oat runtime args"
2014-07-09 14:42:04 +00:00
Colin Cross
dd2ff5541e
build: fix host dex2oat runtime args
...
The dalvik.vm.* properties are in PRODUCT_DEFAULT_PROPERTY_OVERRIDES,
not PRODUCT_PROPERTY_OVERRIDES.
Use $(call func,args) for user defined functions
Prepend the property contents with -Xms or -Xmx when passing to
dex2oat. This only worked before because DEX2OAT_XMS, etc. were blank
due to the first two bugs, which resulted in --runtime-arg --runtime-arg
and anything starting with -- as the argument to --runtime-arg is
silently ignored.
Change-Id: Ifa30038b397355171fefcc5248eea033bb634036
2014-07-09 22:22:10 -07:00
Brian Carlstrom
ef0b6e0c19
am 8a749606
: am 02a5b517
: Merge "Make dex2oat heap size product configurable [build]"
...
* commit '8a7496060df85c241b976d6cd69b13828e452ef9':
Make dex2oat heap size product configurable [build]
2014-07-09 12:36:31 +00:00
Ying Wang
d3b5d574de
am ce40d5f9
: am bc7501e1
: Merge "More consistent use of 64-bit build variable."
...
* commit 'ce40d5f99e9c0658aab9539bf8afa253dfd985e4':
More consistent use of 64-bit build variable.
2014-07-09 12:36:30 +00:00
Deepanshu Gupta
4fc3a60ab6
am 75cdce7b
: (-s ours) am 98da9070
: am 307a8ec9
: am 8eaddc6c
: am 071a2f83
: (-s ours) am ea2f4e3c
: am daee7822
: Integrate build_font.py [DO NOT MERGE]
...
* commit '75cdce7bd6f821eb4103f496fcd3cfbf82c66269':
Integrate build_font.py [DO NOT MERGE]
2014-07-09 12:23:47 +00:00
smain@google.com
49a723a514
am afb83c6b
: (-s ours) am 62cf72b0
: am 60d43dde
: (-s ours) am 97539b1c
: DO NOT MERGE revise butter bar message for clarity
...
* commit 'afb83c6b3ca9935f7ad89a549105b27fb40f5fdb':
DO NOT MERGE revise butter bar message for clarity
2014-07-09 12:23:46 +00:00
Brian Carlstrom
8a7496060d
am 02a5b517
: Merge "Make dex2oat heap size product configurable [build]"
...
* commit '02a5b51798b06434b08ffe2f6e6c485e73cd42bc':
Make dex2oat heap size product configurable [build]
2014-07-09 12:21:56 +00:00
Ying Wang
ce40d5f99e
am bc7501e1
: Merge "More consistent use of 64-bit build variable."
...
* commit 'bc7501e10324caf1318769901d8a382d46be0b60':
More consistent use of 64-bit build variable.
2014-07-09 12:21:48 +00:00
Ying Wang
3abc2a3926
Copy over aidl info for modules not loaded by the current build
...
That way we don't lose the record if user is running mm/mmm.
Change-Id: I1e1a8b99b4f659b73f73d89f409a24aa36464066
2014-07-08 22:11:06 -07:00
Elliott Hughes
45a45d611f
am a97f675c
: am 1b1840cb
: am af95db03
: Merge "ADBS now uses stack_core code to parse traces."
...
* commit 'a97f675c921efdbc34f33f12c9a523fc898e624f':
ADBS now uses stack_core code to parse traces.
2014-07-09 01:28:20 +00:00
Deepanshu Gupta
042c8a06c1
am f0200e87
: am 72146221
: am 0b3aa00e
: am da111964
: (-s ours) am d23dcdf1
: am a0130a4d
: am 9915a60c
: (-s ours) am 1bb64302
: am 1699a434
: am 075f7751
: Integrate build_font.py [DO NOT MERGE]
...
* commit 'f0200e87547272a33e147f435fbae384ea82b359':
Integrate build_font.py [DO NOT MERGE]
2014-07-09 00:01:57 +00:00
Deepanshu Gupta
f0200e8754
am 72146221
: am 0b3aa00e
: am da111964
: (-s ours) am d23dcdf1
: am a0130a4d
: am 9915a60c
: (-s ours) am 1bb64302
: am 1699a434
: am 075f7751
: Integrate build_font.py [DO NOT MERGE]
...
* commit '721462210a5713e9bc59ed292a8bbea9c433a1c1':
Integrate build_font.py [DO NOT MERGE]
2014-07-08 23:58:18 +00:00
Deepanshu Gupta
721462210a
am 0b3aa00e
: am da111964
: (-s ours) am d23dcdf1
: am a0130a4d
: am 9915a60c
: (-s ours) am 1bb64302
: am 1699a434
: am 075f7751
: Integrate build_font.py [DO NOT MERGE]
...
* commit '0b3aa00eaf7a836770681f69c096e915cd686dd9':
Integrate build_font.py [DO NOT MERGE]
2014-07-08 23:54:07 +00:00
Deepanshu Gupta
0b3aa00eaf
am da111964
: (-s ours) am d23dcdf1
: am a0130a4d
: am 9915a60c
: (-s ours) am 1bb64302
: am 1699a434
: am 075f7751
: Integrate build_font.py [DO NOT MERGE]
...
* commit 'da1119642d5a3eb4fd34459ef88d6e1cfbecd1da':
Integrate build_font.py [DO NOT MERGE]
2014-07-08 23:48:54 +00:00
Deepanshu Gupta
da1119642d
am d23dcdf1
: am a0130a4d
: am 9915a60c
: (-s ours) am 1bb64302
: am 1699a434
: am 075f7751
: Integrate build_font.py [DO NOT MERGE]
...
* commit 'd23dcdf135541f2c4d7e61b1f02a04fe6b0bac48':
Integrate build_font.py [DO NOT MERGE]
2014-07-08 23:44:34 +00:00
Deepanshu Gupta
d23dcdf135
am a0130a4d
: am 9915a60c
: (-s ours) am 1bb64302
: am 1699a434
: am 075f7751
: Integrate build_font.py [DO NOT MERGE]
...
* commit 'a0130a4d6fea1b0b256c5a5ad11886f9291a4c0a':
Integrate build_font.py [DO NOT MERGE]
2014-07-08 23:40:06 +00:00