18654 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Tony Mantler	013441f296	resolved conflicts for merge of fab9a1f2 to mnc-dr-dev-plus-aosp ... Change-Id: I5cd69798c3880b835cdebf45dcaf90a8b26a1d4d	2015-08-28 15:56:49 -07:00
Dan Willemsen	349f891d94	Update windows sdk to build non-recursively ... Now the build system can support a HOST_CROSS_OS to build both linux and windows binaries at the same time. Bug: 23566667 Change-Id: I82b497c2621fbfbe493d0568fca42863c5fe9433	2015-08-28 13:30:16 -07:00
Tony Mantler	fab9a1f267	Add preference and recommendation libs to SDK build ... Change-Id: I00c716c42ffbd04b382b1b3016fcc19e9321ae48	2015-08-28 13:29:54 -07:00
Dan Willemsen	d93269d03a	Stop checking HOST_OS ... LOCAL_MODULE_HOST_OS is now enforced, so these can always be defined. Bug: 23566667 Change-Id: I098aaa5e4d346ef346afff3fa641106870aab363	2015-08-28 13:29:43 -07:00
Dan Willemsen	b2fa10bf9c	Remove USE_MINGW, whitelist modules for windows ... Bug: 23566667 Change-Id: I944f48aea13abef0efa157c82ef7c91a63429eb5	2015-08-28 13:29:35 -07:00
Zhen Wang	fe9acde0a2	Support new systrace file structure after switching to catapult ... Change-Id: Ib7e99ff8d5679e32673a62ada7a9e1d9ad2e75cb Signed-off-by: Zhen Wang <zhenw@google.com>	2015-08-28 12:43:01 -07:00
Jae Seo	0c5f4b63b9	am 7ec20820: Merge "MediaRouter: Remove uses of not-yet-public API" into mnc-ub-dev ... * commit '7ec208209a211271dd37b6749d8a93d963150a69': MediaRouter: Remove uses of not-yet-public API	2015-08-28 01:12:02 +00:00
Jae Seo	7ec208209a	Merge "MediaRouter: Remove uses of not-yet-public API" into mnc-ub-dev	2015-08-28 01:04:16 +00:00
Jae Seo	106e33404a	MediaRouter: Remove uses of not-yet-public API ... Change-Id: I05949c75081fc963fe4b025f6f4db13d0255eeef	2015-08-27 17:54:54 -07:00
Bill Yi	28f30d6684	am 7fd985f2: Merge commit \'7fa684064c0bfb6f7f27c4e03cda51aac5e930db\' into HEAD ... * commit '7fd985f2a57f8899b960269b3e508dc55597ed9c':	2015-08-27 23:37:46 +00:00
Bill Yi	7fd985f2a5	Merge commit '7fa684064c0bfb6f7f27c4e03cda51aac5e930db' into HEAD	2015-08-27 15:09:33 -07:00
Yusuf Ozuysal	d0a7cb4a17	am 517a2f27: Revert "Add customtabs support lib to extras/android/support/" ... * commit '517a2f27bfd997a09679126a78e3d1a8a0e58dd1': Revert "Add customtabs support lib to extras/android/support/"	2015-08-27 21:59:08 +00:00
Chris Flatt	b7b824cfca	am 2b6ef49f: am 14e48160: Merge "Bump support library version to 23.0.1 DO NOT MERGE" into mnc-dev ... * commit '2b6ef49f07a99fee4b0ef9169e5aff4c9d7536e4': Bump support library version to 23.0.1 DO NOT MERGE	2015-08-27 21:58:25 +00:00
Chris Flatt	2b6ef49f07	am 14e48160: Merge "Bump support library version to 23.0.1 DO NOT MERGE" into mnc-dev ... * commit '14e48160d2382c499a4abd0ebd90564881643215': Bump support library version to 23.0.1 DO NOT MERGE	2015-08-27 21:50:38 +00:00
Yusuf Ozuysal	7615d82816	am ac16badc: am e226a0f5: Add customtabs support lib to extras/android/support/ ... * commit 'ac16badc765571198fbafa7694c991c927643ed7': Add customtabs support lib to extras/android/support/	2015-08-27 21:47:57 +00:00
Yusuf Ozuysal	517a2f27bf	Revert "Add customtabs support lib to extras/android/support/" ... This reverts commit 53ad2de7f6. Change-Id: Ia9831d344e6e0b12c55544b02254daae109f09c5 (cherry picked from commit 04a6dcacf0)	2015-08-27 21:45:26 +00:00
Yusuf Ozuysal	ac16badc76	am e226a0f5: Add customtabs support lib to extras/android/support/ ... * commit 'e226a0f56949b1d6ab97a31ed987adb7f7513be9': Add customtabs support lib to extras/android/support/	2015-08-27 21:42:54 +00:00
Chris Flatt	14e48160d2	Merge "Bump support library version to 23.0.1 DO NOT MERGE" into mnc-dev	2015-08-27 21:32:59 +00:00
Tor Norbye	51397c4b44	am 1f2c59af: Merge "Pass in current android.jar to api-generator" into mnc-ub-dev ... * commit '1f2c59aff8691075606294dc8feb6d3979d46a7b': Pass in current android.jar to api-generator	2015-08-27 21:27:15 +00:00
Tor Norbye	1f2c59aff8	Merge "Pass in current android.jar to api-generator" into mnc-ub-dev	2015-08-27 20:59:16 +00:00
Chris Flatt	a33101aaff	Bump support library version to 23.0.1 DO NOT MERGE ... Change-Id: I268eea0b49a9bf611e36bb9cc5d91adf2a2ff01e	2015-08-27 20:51:10 +00:00
Yusuf Ozuysal	e226a0f569	Add customtabs support lib to extras/android/support/ ... Currently the only way to get access to customtabs library through download m2repository and using the aar file whereas all other support libs are also present in extras/android/support/ with the corresponding resources and jar file. This adds the jar and manifest to the corresponding folder to avoid the confusion to developers. This is relanding https://googleplex-android-review.git.corp.google.com/#/c/756492/ after it was reverted due to not having the corresponding Android.mk change. Change-Id: I21969994e1dd0bb4f9abbfa395cf284e3cfc396d	2015-08-27 18:29:07 +00:00
Yusuf Ozuysal	0d364a4d5d	am 31338f71: (-s ours) am 53ad2de7: Add customtabs support lib to extras/android/support/ ... * commit '31338f7196f904345f18085a1c0a47b49d6c0328':	2015-08-27 10:49:13 +00:00
Elliott Hughes	1f706c7edb	am 436f03a0: (-s ours) am b851cbc2: am 1a8697f9: Merge "Patch android-21 with aarch64 <sys/user.h> fixes." ... * commit '436f03a0800dee1f978d9da87f2696055df43204':	2015-08-27 10:49:11 +00:00
Andreas Gampe	9dc995d5f4	am e4aa7116: (-s ours) am 4cacf112: am 07ddfb0e: Merge "Development/scripts: Add sanitizer dump support to stack" ... * commit 'e4aa7116669afa0559188c9e0bb2a9af0d883f87':	2015-08-27 10:49:09 +00:00
Xavier Ducrohet	d819e286d1	am 09bc775a: (-s ours) am 9878bf64: Update build tools version to 23.0.1 -- DO NOT MERGE. ... * commit '09bc775a64d678231790adfa6bcdc2973c5696dd':	2015-08-27 10:49:06 +00:00
Trevor Johns	418143ddc0	am 10a3cc6f: (-s ours) am 81556478: Sync sample prebuilts for mnc-dev ... * commit '10a3cc6f51d844623af1fa87a5ff625ca16c9a9e':	2015-08-27 10:49:03 +00:00
Trevor Johns	b84ffd99a9	am bb03ef54: (-s ours) am c8e94bf5: Sync mnc-dev sample prebuilts ... * commit 'bb03ef5494e8ea8323f64508652d212520d858ff':	2015-08-27 10:49:02 +00:00
Trevor Johns	4b27479cf2	am 768ab888: (-s ours) am a56a6341: Update sample prebuilts to use latest deps ... * commit '768ab8886dd6108b9e4b8260c0bd4376227b2d63':	2015-08-27 10:49:00 +00:00
Trevor Johns	2ebe1938c2	am 3ed5edac: (-s ours) am 9a9c2ea5: Bump mnc-dev samples package to v3 (DO NOT MERGE) ... * commit '3ed5edac7d3e2dd5f7e9b25d5f786d1524374bf1':	2015-08-27 10:48:59 +00:00
Trevor Johns	4a11b75c9e	am f0946be5: (-s ours) am d95a687e: Sync sample prebuilts for mnc-dev ... * commit 'f0946be5fbae1b38ffa4802dc89b0541821830f0':	2015-08-27 10:48:57 +00:00
Dan Willemsen	6382bc1de9	am ab842478: (-s ours) am 283439c7: am d592f8c7: Merge "Remove the mingw package check" ... * commit 'ab842478d40a6fd10307c40956ad20090321e3b3':	2015-08-27 10:48:55 +00:00
Elliott Hughes	5c2d939714	am ace016e1: (-s ours) am 51d2e710: am 944f23ec: Merge "AdbWinUsbApi.dll: fix race condition crash in WinUsb.dll" ... * commit 'ace016e15d41061e6d86c1da4887799db5dd009b':	2015-08-27 10:48:52 +00:00
Deepanshu Gupta	cddd3d3436	am 566f438f: (-s ours) am 40bd1993: Update revision for layoutlib and docs. ... * commit '566f438f5b62ba3fe094e0380a8692ad37d26024':	2015-08-27 10:48:42 +00:00
Xavier Ducrohet	5fca532156	am c22011dd: (-s ours) am 3c274b20: Update SDK component versions for the official SDK 23.0.0 ... * commit 'c22011dd051df5bc9a4097d1c57c8c9d487a4d4d':	2015-08-27 10:48:40 +00:00
Konstantinos Menychtas	9f8ef17e4a	am 6db7fc99: (-s ours) am 7cc14006: am c5a2819b: am d54746eb: am ee95843b: am b0abc5df: am 0f394210: am e855b6d9: (-s ours) am 55b696d1: am 6193ccb4: am 29699330: (-s ours) am 365f4ece: am c3eff933: am 70a395c4: (-s ours) am 35f73b6f: am 086adab4: am ed56df6f: am 91df3bc9: am a ... * commit '6db7fc99648402a875ad00680a6f0a490d0c8bc4':	2015-08-27 10:48:38 +00:00
Nick Kralevich	7da6fbcb9a	am 5b3b2193: (-s ours) am 88aa40df: am b4ef2aba: am f2a8aa34: am fdcade18: am ff246059: am 5fc6ca11: am d7138ba4: am 6ab0f7a9: am e8566ffb: am c0b3754c: am 98970843: am 4dec9d0d: am d2bd9baf: am 8d309635: am fdcb8bbb: am aed7823a: resolve merge conflicts of 8e4ac6bd to jb-mr1.1 ... * commit '5b3b21932b81ac7316636db2fb3302140ccfe21a':	2015-08-27 10:48:36 +00:00
Konstantinos Menychtas	0fcc012370	am d1d8a50d: (-s ours) am f6cf3cdd: am 82dea6f6: am 33c7b977: am 44a06cae: am fe281e20: am d886ba21: am 2235ef28: (-s ours) am 19cf6f34: am a6f725d6: am 26d66e55: (-s ours) am c5825853: am c6b7ecd7: am 4e5b7ad5: (-s ours) am 27ac85b1: am ed56df6f: am 91df3bc9: am a4bb0b7c: am d ... * commit 'd1d8a50ddb1924b6003260a784fa92d82950c404':	2015-08-27 10:48:34 +00:00
Nick Kralevich	5ffcf2a67c	am 628877cc: (-s ours) am 73f7cb3d: am 497bcc4d: am 5e5f2ab3: am 1ea2e463: am 6d181dc0: am 63c3068a: am 8314da1c: am 3728b128: am 97af61da: am 178f5eee: am e1baec5d: am 4393aeff: am 947e4e27: am 29b060fa: am aed7823a: resolve merge conflicts of 8e4ac6bd to jb-mr1.1-dev (merge - ... * commit '628877cc073076a7d93e3d937151c15e1c54ffae':	2015-08-27 10:48:32 +00:00
Konstantinos Menychtas	fe8a431b9c	am 268ca6d5: (-s ours) am 756650ce: am 8484c46a: (-s ours) am 7f3cb054: am 20f4cf0b: am 4b70b572: am 2032317a: am 73e98d27: (-s ours) am 0878662f: am e8641a98: am 202648b0: (-s ours) am ae1dae19: am ffb1640e: am 4ef13a69: (-s ours) am 14dcd775: am 40d02c8f: am ca8720d5: DO NOT ... * commit '268ca6d58c3f1710e5ace55faea05b4130a41293':	2015-08-27 10:48:30 +00:00
Konstantinos Menychtas	7d9844b778	am 520a2472: (-s ours) am 8cfb8f1f: am 7af114e3: (-s ours) am e8158a85: am cdb21d5f: am 6dac7dff: am 6c65c2f5: am 895ff7f3: (-s ours) am 9780219a: am 980be81e: am 2c414f76: (-s ours) am b2cff440: am 18c63f0a: am 87cd4d75: (-s ours) am 9ccb1028: am ca8720d5: DO NOT MERGE Increas ... * commit '520a24726d5cbadf2f6df5fd886d0d9108441946':	2015-08-27 10:48:28 +00:00
Konstantinos Menychtas	2cb2cc7f93	am 081b297c: (-s ours) am 7eebbae9: am 90fdef7e: (-s ours) am d15073bb: am 0d68aeab: am d49bca70: am a944d9a6: am 30461421: (-s ours) am 6285d756: am 043df767: am 474f468d: (-s ours) am 86317696: am c526381f: am 9cb9a14c: (-s ours) am bad193d9: am 91ac4618: am 0e94cee9: DO NOT ... * commit '081b297c8e88a4bd838b76eb95336ee5e70aab88':	2015-08-27 10:48:24 +00:00
Konstantinos Menychtas	7d9fe56d02	am 2332a79d: (-s ours) am e8016665: am eb4cef2a: (-s ours) am 251bb36d: am ceef025b: am 5ce76991: am 860c3d7c: am 1bbfccc1: (-s ours) am 0c635c71: am 2d5d97ef: am bc013aa0: (-s ours) am 8de93852: am 6384e218: DO NOT MERGE Increase the system-image revision number after opengl b ... * commit '2332a79d7c31001efa3489c9268cd1c73beb24ad':	2015-08-27 10:48:16 +00:00
Nick Kralevich	7a8eb2286e	am 3fdcce13: (-s ours) am b07478d7: am c1925e98: am dd48de4d: am 163341ca: am 89e5f5c1: am c5066d81: am bc7cb7d9: resolved conflicts for merge of 5e69741e to klp-modular-dev ... * commit '3fdcce136536965df56a55b97c97e3fa1c83c6be':	2015-08-27 10:48:13 +00:00
Konstantinos Menychtas	a985f3eea1	am 7168c7db: (-s ours) am 3ab6703b: am ea9fe7e5: (-s ours) am 0f528e4f: am 14c5da2f: resolved conflicts for merge of bbb03147 to lmp-mr1-dev ... * commit '7168c7dbe714c49582ac905915e14c0912675dbf':	2015-08-27 10:48:10 +00:00
Konstantinos Menychtas	4197c279e3	am 310180a9: (-s ours) am 28aafa0d: am c631e5b2: (-s ours) am 6bf2b78e: am fc4964b9: DO NOT MERGE Increase the system-image revision number after opengl bug fix ... * commit '310180a95ef17529e0242afbd7bb931e1178a03c':	2015-08-27 10:48:08 +00:00
Dake Gu	e5304a4754	am 498117d7: (-s ours) am 6ad53c99: Merge "BrowseErrorFragment: fix NPE of not attached BackgroundManager" into mnc-dev ... * commit '498117d791d459286c3035572736ed830d04bc73':	2015-08-27 10:48:06 +00:00
Ying Wang	2ae90eaa5a	am 87108c85: (-s ours) resolved conflicts for merge of 0f32d65d to mnc-dev-plus-aosp ... * commit '87108c8530cd7f8297c40fa99a50fbc0e1f983cf':	2015-08-27 10:48:04 +00:00
Dianne Hackborn	9a70376e29	am 3e845dce: (-s ours) am 424fb606: Change MNC codename to just M. ... * commit '3e845dce3304b6685624c580d1a132957d2dd238':	2015-08-27 10:47:59 +00:00
Marco Nelissen	a493779269	am c4050f2e: (-s ours) am 9146cbdb: Merge "Fix CRCs in file so it passes the new CRC check" into mnc-dev ... * commit 'c4050f2ed318c0994dea63e396c8e063641b75d2':	2015-08-27 10:47:50 +00:00