The Android Open Source Project
d0ec3286e7
am f66a269f: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release jb-mr2-zeroday-deb-release - do not merge
...
* commit 'f66a269fa4300fa691348bdd55a2a16ff55de608':
JWR66W
JSS15O
JLS36
JSS15N
"JSS15M"
"JSS15L"
"JSS15K"
2013-08-08 14:14:13 -07:00
The Android Automerger
c618d4f100
Fix klp-dev build file
2013-08-08 07:47:58 -07:00
The Android Automerger
2a516ccce5
"KRS39B"
2013-08-08 07:39:23 -07:00
The Android Automerger
67d10b46e3
merge in klp-dev history after reset to master
2013-08-08 07:37:17 -07:00
Jason Monk
89fa610033
Merge "Add libpac, pacserver, and ProxyHandler to build."
2013-08-08 02:41:29 +00:00
Jason Monk
b5e2c29dba
Add libpac, pacserver, and ProxyHandler to build.
...
This allows frameworks to reference libpac, ProxyHandler and pacserver as
required to add PAC support.
bug:10182711
Change-Id: Iffac836a517518bd4b9a473e09372fbd10315539
2013-08-08 01:39:10 +00:00
The Android Open Source Project
f66a269fa4
Reconcile with jb-mr2-release jb-mr2-zeroday-release jb-mr2-zeroday-deb-release - do not merge
...
Change-Id: Ib795b6944220a2b13f6def23ee279815e53ac6b4
2013-08-07 09:42:55 -07:00
The Android Automerger
95de125300
Fix dev branch Build ID
2013-08-07 09:23:00 -07:00
The Android Automerger
e1ae2366b7
"KRS38B"
2013-08-07 09:16:08 -07:00
The Android Automerger
0cc007a161
JWR66W
2013-08-06 20:33:52 -07:00
The Android Automerger
797256196b
JSS15O
2013-08-06 20:09:28 -07:00
Mike Lockwood
c73018c2e9
Fix typo from previous change to fix the build
...
Change-Id: I6cf7217eb81abd794339143b7c23456b68808caf
2013-08-06 16:15:48 -07:00
Mike Lockwood
6e5d867e30
Add support for overriding default Java libraries on a per-target basis
...
Change-Id: I425041554867a7ed7d74e1d603f160b2110bc86b
2013-08-06 15:07:18 -07:00
Stuart Scott
ee0748821f
Add boot jars to fix Dalvik missing bootclasspath for mini emulator.
...
bug: 10146858
Change-Id: I159a5951a036f32c7eb02569c5b0fb12ce3a76dd
2013-08-05 16:05:08 -07:00
The Android Automerger
da28a797d8
JLS36
2013-08-05 15:25:41 -07:00
The Android Automerger
c2b7823e5f
JSS15N
2013-08-05 11:12:19 -07:00
Ying Wang
bc9e8a7c7f
am 4a0929e3: am 38775140: am 08c07c59: Merge "Remove unnecessary dependencies between host and target modules." into jb-mr2-dev
...
* commit '4a0929e3590b08838280bffae56d357a6194260e':
Remove unnecessary dependencies between host and target modules.
2013-08-02 17:58:22 -07:00
Stephen Hines
c48d08a334
resolved conflicts for merge of 79ee17ea
to master
...
Change-Id: I78ae4a54bdc05df984061ac0b0d0fc3488b0534e
2013-08-02 17:50:03 -07:00
Ying Wang
4a0929e359
am 38775140: am 08c07c59: Merge "Remove unnecessary dependencies between host and target modules." into jb-mr2-dev
...
* commit '387751401ca83e4419444247a176f2ea1f35a50b':
Remove unnecessary dependencies between host and target modules.
2013-08-02 17:40:59 -07:00
Stephen Hines
79ee17eaa4
am 367e56f1: am 3fc8dacd: Remove abcc from build.
...
* commit '367e56f1b7d79086785f61c8c522644f134c3136':
Remove abcc from build.
2013-08-02 17:40:58 -07:00
Ying Wang
387751401c
am 08c07c59: Merge "Remove unnecessary dependencies between host and target modules." into jb-mr2-dev
...
* commit '08c07c590322e1cbc8464dd371a2e5120b88e38d':
Remove unnecessary dependencies between host and target modules.
2013-08-02 17:39:01 -07:00
Stephen Hines
367e56f1b7
am 3fc8dacd: Remove abcc from build.
...
* commit '3fc8dacd9209a846de34edaee0dc14d50cae3d25':
Remove abcc from build.
2013-08-02 17:38:59 -07:00
Ying Wang
08c07c5903
Merge "Remove unnecessary dependencies between host and target modules." into jb-mr2-dev
2013-08-02 21:51:10 +00:00
Ying Wang
07c07062df
Let apicheck visible to unbundled build.
...
Change-Id: I22cd1e67aeb6bf23229016215ee0a15f5116513f
(cherry picked from commit 48d132659ebf99cf41d9fbf62ab1f09604938ca7)
2013-08-02 21:35:15 +00:00
The Android Automerger
2fe79fc7af
"JSS15M"
2013-08-02 13:54:06 -07:00
Ying Wang
2c86e70705
Merge "Don't check build prebuilt modules."
2013-08-02 20:31:53 +00:00
Ying Wang
883071ff1f
Don't check build prebuilt modules.
...
Change-Id: I35bcd97cf41d1f6e0cdc2676a07127bff4f14e6d
2013-08-02 13:30:54 -07:00
Stephen Hines
3fc8dacd92
Remove abcc from build.
...
Change-Id: I9ca5deea98adbba03081349c16a391a9dd84e347
2013-08-02 11:33:13 -07:00
Ying Wang
ee9e88cf96
am a3827c4b: am 840f9d0a: Merge "Remove BUILD_HOST_JAVA_LIBRARY dependency on aapt"
...
* commit 'a3827c4b6c1a4c5a1618515ccb8fc6692837ee71':
Remove BUILD_HOST_JAVA_LIBRARY dependency on aapt
2013-08-02 11:07:44 -07:00
Ying Wang
a3827c4b6c
am 840f9d0a: Merge "Remove BUILD_HOST_JAVA_LIBRARY dependency on aapt"
...
* commit '840f9d0a274cffbef790dc20cd4f9eec27c3841b':
Remove BUILD_HOST_JAVA_LIBRARY dependency on aapt
2013-08-02 11:05:23 -07:00
Ying Wang
840f9d0a27
Merge "Remove BUILD_HOST_JAVA_LIBRARY dependency on aapt"
2013-08-02 17:53:15 +00:00
Stuart Scott
90f7f10f86
Merge "Changing make hierarchy of mini."
2013-08-02 17:37:41 +00:00
Ying Wang
cd7d466459
Merge "Split the product-graph build commands"
2013-08-02 17:19:30 +00:00
Brian Carlstrom
5c619fcb5f
Remove BUILD_HOST_JAVA_LIBRARY dependency on aapt
...
Change-Id: I8be48114b43e46255977be1677b0c0bbccdf9163
2013-08-01 23:31:19 -07:00
Stuart Scott
c95e83d161
Changing make hierarchy of mini.
...
bug: 8503391
Change-Id: I22f2048cec7f232010e00109ef82bed271602cb1
2013-08-02 02:04:56 +00:00
Daniel Sandler
c86b05f807
Merge "Add --exact flag to `pid` tool; new `qpid` tool."
2013-08-02 01:49:33 +00:00
Scott Main
ad0f14f4ef
am 76451706: am bb385125: am 3b90aff0: add fixed size to training icons (and remove whitespaces)
...
* commit '76451706d86daaf38889254f56e47ba989619b9c':
add fixed size to training icons (and remove whitespaces)
2013-08-01 18:37:40 -07:00
Scott Main
76451706d8
am bb385125: am 3b90aff0: add fixed size to training icons (and remove whitespaces)
...
* commit 'bb385125dcb04ec765d6837c576d487326d5fcb4':
add fixed size to training icons (and remove whitespaces)
2013-08-01 18:35:27 -07:00
Scott Main
bb385125dc
am 3b90aff0: add fixed size to training icons (and remove whitespaces)
...
* commit '3b90aff04cf7ef434baf47b3eb4c73a7ecad8764':
add fixed size to training icons (and remove whitespaces)
2013-08-01 18:33:32 -07:00
Scott Main
3b90aff04c
add fixed size to training icons (and remove whitespaces)
...
Change-Id: Iad8b597b9f181833d9f1d63e128abb49486fa543
2013-08-01 18:21:31 -07:00
Ying Wang
3670c8449a
Split the product-graph build commands
...
1) As more product configuration files are added to the source tree, the
command line has become too long.
2) Escape "(" and ")" that may may appear in PRODUCT_MODEL.
Change-Id: I08f278dce434050f013498327c7cbf3592512460
2013-08-01 17:45:35 -07:00
Ying Wang
949c4eb073
Delete the kernel file when build config is changed
...
Now we have products of the same device type but with different kernel,
and we want to do incremental build on them.
Bug: 10133257
Change-Id: Iff4aae11e474d2822f02c62822bd028a5ba5b47a
2013-08-01 15:46:25 -07:00
The Android Automerger
40f9ed6e1f
"JSS15L"
2013-08-01 13:44:11 -07:00
Ying Wang
16b92edc38
Remove unnecessary dependencies between host and target modules.
...
With this change, modules introduced by LOCAL_REQUIRED_MODULES will be
split by host/target: target modules only depend on target modules and
host modules only depend on host modules.
Bug: 9303948
Change-Id: I4078a7983aa3c00e99534f3f170dfe4b66b12287
2013-07-31 20:00:45 -07:00
Ying Wang
a800e3d328
Merge "Error and exit if BUILD_MULTI_PREBUILT is incorrectly used"
2013-07-31 23:54:07 +00:00
Ying Wang
a8ae7f787d
Error and exit if BUILD_MULTI_PREBUILT is incorrectly used
...
Bug: 10114476
Change-Id: Id51e7ca443c3742e17cbe114aefbb7ed3870b0e5
2013-07-31 16:26:01 -07:00
Elliott Hughes
c22bb6ecab
Remove one last icu.dat.
...
Change-Id: Iadeae68e49b18d735e7cfc263800c96998efd23b
2013-07-31 16:25:26 -07:00
Elliott Hughes
6f16857720
resolved conflicts for merge of 8714c831
to master
...
Change-Id: I58a6ab217aeaa5de099a9d79d1830c833f718a9d
2013-07-31 15:49:04 -07:00
Elliott Hughes
8714c83164
am 2266fa92: Merge "Remove the bogus icu.dat dependency."
...
* commit '2266fa92a856a81fdfc5e6c5d9b073b2d6173a02':
Remove the bogus icu.dat dependency.
2013-07-31 15:43:11 -07:00
Elliott Hughes
2266fa92a8
Merge "Remove the bogus icu.dat dependency."
2013-07-31 22:35:48 +00:00