StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,675 Commits 1 Branch 0 Tags
0933e17bb65aed74349dd64caef6f68f8c29d67c
Commit Graph

24675 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ying Wang
1204e257fc am d67b8c1a: am 23cb26c7: am 20febe3d: Merge "Don\'t build otapackage on Mac." 
* commit 'd67b8c1ab68ec57ff2b82d41453c406381fa5a08':
  Don't build otapackage on Mac.
 2015-08-11 23:28:44 +00:00
Ying Wang
d67b8c1ab6 am 23cb26c7: am 20febe3d: Merge "Don\'t build otapackage on Mac." 
* commit '23cb26c7bfa1714db3b31b166be49a0aa46e4a08':
  Don't build otapackage on Mac.
 2015-08-11 23:23:45 +00:00
Ying Wang
23cb26c7bf am 20febe3d: Merge "Don\'t build otapackage on Mac." 
* commit '20febe3d839131e2cde795ae2a36f93c5ac1c378':
  Don't build otapackage on Mac.
 2015-08-11 23:14:52 +00:00
Ian Pedowitz
eef23a78b8 am 58251fe4: resolved conflicts for merge of 87eb4007 to mnc-dr-dev-plus-aosp 
* commit '58251fe44d120b284bcdc47c3f28fbdfa6fb524d':
  Increasing arm(64)? emulator partition sizes to 1.5GB
 2015-08-11 23:14:09 +00:00
Ying Wang
20febe3d83 Merge "Don't build otapackage on Mac." 2015-08-11 22:49:25 +00:00
Ian Pedowitz
58251fe44d resolved conflicts for merge of 87eb4007 to mnc-dr-dev-plus-aosp 
Change-Id: I7cf9b0153457f9cfba93966db78e0c04b5d216aa
 2015-08-11 15:41:19 -07:00
Ian Pedowitz
87eb4007e1 am b4571028: am c055f9b5: am e5a63158: Merge "Increasing arm(64)? emulator partition sizes to 1.5GB" into mnc-dev 
* commit 'b4571028427eed72e090bfa90a816619bca7e6cc':
  Increasing arm(64)? emulator partition sizes to 1.5GB
 2015-08-11 22:24:49 +00:00
Ian Pedowitz
b457102842 am c055f9b5: am e5a63158: Merge "Increasing arm(64)? emulator partition sizes to 1.5GB" into mnc-dev 
* commit 'c055f9b51a67de39a2fd384d3d974b9b8566884e':
  Increasing arm(64)? emulator partition sizes to 1.5GB
 2015-08-11 22:06:16 +00:00
Ian Pedowitz
c055f9b51a am e5a63158: Merge "Increasing arm(64)? emulator partition sizes to 1.5GB" into mnc-dev 
* commit 'e5a631585a7b07c329f9ada04c99ed04b6c16b62':
  Increasing arm(64)? emulator partition sizes to 1.5GB
 2015-08-11 21:59:25 +00:00
Ian Pedowitz
e5a631585a Merge "Increasing arm(64)? emulator partition sizes to 1.5GB" into mnc-dev 2015-08-11 21:54:17 +00:00
Clay Murphy
04376d940d am 8ecce002: am 540abfef: am 87492b88: am 86e510cc: am 71a33c4d: Merge "Add the ability to display annotations in the generated docs (cherry-picked from commit 87c44d8a11) Bug: 8440225 Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20" 
* commit '8ecce002390172310a3e9d7ab3e92f647c23b1fb':
  Add the ability to display annotations in the generated docs (cherry-picked from commit 87c44d8a11) Bug: 8440225 Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20
 2015-08-11 21:35:05 +00:00
Clay Murphy
8ecce00239 am 540abfef: am 87492b88: am 86e510cc: am 71a33c4d: Merge "Add the ability to display annotations in the generated docs (cherry-picked from commit 87c44d8a11) Bug: 8440225 Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20" into mnc-dev 
* commit '540abfef5e1a0b73b928914100842e000f8ea010':
  Add the ability to display annotations in the generated docs (cherry-picked from commit 87c44d8a11) Bug: 8440225 Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20
 2015-08-11 21:24:38 +00:00
Clay Murphy
540abfef5e am 87492b88: am 86e510cc: am 71a33c4d: Merge "Add the ability to display annotations in the generated docs (cherry-picked from commit 87c44d8a11) Bug: 8440225 Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20" into mnc-dev 
* commit '87492b889d2d90512c1e7129e3e5d04339d9e0e2':
  Add the ability to display annotations in the generated docs (cherry-picked from commit 87c44d8a11) Bug: 8440225 Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20
 2015-08-11 21:19:20 +00:00
Clay Murphy
87492b889d am 86e510cc: am 71a33c4d: Merge "Add the ability to display annotations in the generated docs (cherry-picked from commit 87c44d8a11) Bug: 8440225 Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20" into mnc-dev 
* commit '86e510cc313a464870ff82a9cd7f7206ea4aeb63':
  Add the ability to display annotations in the generated docs (cherry-picked from commit 87c44d8a11) Bug: 8440225 Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20
 2015-08-11 21:12:33 +00:00
Clay Murphy
86e510cc31 am 71a33c4d: Merge "Add the ability to display annotations in the generated docs (cherry-picked from commit 87c44d8a11) Bug: 8440225 Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20" into mnc-dev 
* commit '71a33c4d5b010757423980b90681445ca2bb2be0':
  Add the ability to display annotations in the generated docs (cherry-picked from commit 87c44d8a11) Bug: 8440225 Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20
 2015-08-11 21:04:24 +00:00
Clay Murphy
71a33c4d5b Merge "Add the ability to display annotations in the generated docs (cherry-picked from commit 87c44d8a11) Bug: 8440225 Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20" into mnc-dev 2015-08-11 20:55:24 +00:00
Mike Dodd
a8b0905e16 Include new AOSP messaging app in base builds. 
b/23110861

Change-Id: I365bedc809425c901982f867e671070344d1112b
 2015-08-11 13:14:09 -07:00
Ian Pedowitz
4e0d34c7c7 Increasing arm(64)? emulator partition sizes to 1.5GB 
Bug: 23093319
Change-Id: I5e493ef4715cee96ae6ab40d6415f5330075fad6
 2015-08-11 12:53:39 -07:00
Ian Pedowitz
8fb75ec37d am 35abe706: am c7e051e0: am 112f4c07: am 0150dae6: am 073f74d9: Merge "Increasing x86 emulator system partition size" into mnc-dev 
* commit '35abe70636009dfec96a20efc9f81c5eb907c7a2':
  Increasing x86 emulator system partition size
 2015-08-11 19:46:26 +00:00
Ian Pedowitz
35abe70636 am c7e051e0: am 112f4c07: am 0150dae6: am 073f74d9: Merge "Increasing x86 emulator system partition size" into mnc-dev 
* commit 'c7e051e0b1a7956bddcf8955ef837f2c1acff4af':
  Increasing x86 emulator system partition size
 2015-08-11 19:39:45 +00:00
Ian Pedowitz
c7e051e0b1 am 112f4c07: am 0150dae6: am 073f74d9: Merge "Increasing x86 emulator system partition size" into mnc-dev 
* commit '112f4c07c7de4bdb28aeb150233b24e7b1463f86':
  Increasing x86 emulator system partition size
 2015-08-11 19:33:04 +00:00
Ian Pedowitz
112f4c07c7 am 0150dae6: am 073f74d9: Merge "Increasing x86 emulator system partition size" into mnc-dev 
* commit '0150dae61563c44dfb12a6d367a4f4f72253fcc4':
  Increasing x86 emulator system partition size
 2015-08-11 19:26:21 +00:00
Ian Pedowitz
0150dae615 am 073f74d9: Merge "Increasing x86 emulator system partition size" into mnc-dev 
* commit '073f74d90853b39de32308fa3eeab9aa8998bd69':
  Increasing x86 emulator system partition size
 2015-08-11 19:18:13 +00:00
Ian Pedowitz
073f74d908 Merge "Increasing x86 emulator system partition size" into mnc-dev 2015-08-11 19:12:28 +00:00
Ying Wang
09c4b68dfd Don't build otapackage on Mac. 
Also removed the unneeded variable DISTTOOLS
and the unnecessary dependency of otapackage/updatepackage on DISTTOOLS.

Bug: 23085297
Change-Id: I6b269003a72bb48eda1260c8d9b4bd88974bcde9
 2015-08-11 11:45:54 -07:00
Ian Pedowitz
e3ef496245 am 7ec5d8a4: am dfb29da8: am c396ce62: am c79c7d15: am a18c5028: Final SDK, set PLATFORM_PREVIEW_SDK_VERSION to 0 
* commit '7ec5d8a457305c020ed9f0dc15797019c2358714':
  Final SDK, set PLATFORM_PREVIEW_SDK_VERSION to 0
 2015-08-11 18:07:59 +00:00
Ian Pedowitz
7ec5d8a457 am dfb29da8: am c396ce62: am c79c7d15: am a18c5028: Final SDK, set PLATFORM_PREVIEW_SDK_VERSION to 0 
* commit 'dfb29da864437e492405b1d0de0d8af05995859a':
  Final SDK, set PLATFORM_PREVIEW_SDK_VERSION to 0
 2015-08-11 17:58:38 +00:00
Ian Pedowitz
dfb29da864 am c396ce62: am c79c7d15: am a18c5028: Final SDK, set PLATFORM_PREVIEW_SDK_VERSION to 0 
* commit 'c396ce6240dec53682ba6d2fe31ac155d4342d65':
  Final SDK, set PLATFORM_PREVIEW_SDK_VERSION to 0
 2015-08-11 17:52:59 +00:00
Ian Pedowitz
c396ce6240 am c79c7d15: am a18c5028: Final SDK, set PLATFORM_PREVIEW_SDK_VERSION to 0 
* commit 'c79c7d152f6c481992748f6fe4bb3cc82233ae4d':
  Final SDK, set PLATFORM_PREVIEW_SDK_VERSION to 0
 2015-08-11 17:47:14 +00:00
Ian Pedowitz
c79c7d152f am a18c5028: Final SDK, set PLATFORM_PREVIEW_SDK_VERSION to 0 
* commit 'a18c5028d77f0323b8b8959982ae7d6b1ec7aded':
  Final SDK, set PLATFORM_PREVIEW_SDK_VERSION to 0
 2015-08-11 17:41:08 +00:00
Ian Pedowitz
a18c5028d7 Final SDK, set PLATFORM_PREVIEW_SDK_VERSION to 0 
Change-Id: Ic5af01a7017d2ac5b73d677689d15e4a8ad5dc14
 2015-08-11 10:02:15 -07:00
Ian Pedowitz
5f058af042 am af87dadd: am a5541820: am 817a2d2b: am e2312db1: am 38ffb0cf: Bump PLATFORM_PREVIEW_SDK_VERSION to 4 
* commit 'af87dadd0ca161dc8ddf5e1edc017a8847c6b85c':
  Bump PLATFORM_PREVIEW_SDK_VERSION to 4
 2015-08-11 16:47:37 +00:00
Ian Pedowitz
af87dadd0c am a5541820: am 817a2d2b: am e2312db1: am 38ffb0cf: Bump PLATFORM_PREVIEW_SDK_VERSION to 4 
* commit 'a55418206b53f7a640fc94a83c088566504e8692':
  Bump PLATFORM_PREVIEW_SDK_VERSION to 4
 2015-08-11 16:36:41 +00:00
Ian Pedowitz
a55418206b am 817a2d2b: am e2312db1: am 38ffb0cf: Bump PLATFORM_PREVIEW_SDK_VERSION to 4 
* commit '817a2d2baa0df3ad2b30ff924b51aa5d08194201':
  Bump PLATFORM_PREVIEW_SDK_VERSION to 4
 2015-08-11 16:30:38 +00:00
Ian Pedowitz
817a2d2baa am e2312db1: am 38ffb0cf: Bump PLATFORM_PREVIEW_SDK_VERSION to 4 
* commit 'e2312db19ae06eef0c4d8fd2da668b345ad3070d':
  Bump PLATFORM_PREVIEW_SDK_VERSION to 4
 2015-08-11 16:24:01 +00:00
Ian Pedowitz
e2312db19a am 38ffb0cf: Bump PLATFORM_PREVIEW_SDK_VERSION to 4 
* commit '38ffb0cf899d94cb72409519bd25dc94048dd719':
  Bump PLATFORM_PREVIEW_SDK_VERSION to 4
 2015-08-11 16:17:29 +00:00
Ian Pedowitz
38ffb0cf89 Bump PLATFORM_PREVIEW_SDK_VERSION to 4 
Change-Id: Ia44cfc3ff839c9ec84aec32e37c42b96de67075e
 2015-08-11 07:50:04 -07:00
Ian Pedowitz
5394e8bd12 Increasing x86 emulator system partition size 
Seems sdk_google_phone_x86 is building larger than 750MB

Bug: 23093319
Change-Id: Ib3ddbbb96a9dcea02eb6da7362ac0142bdfae4de
 2015-08-11 03:39:34 +00:00
Omari Stephens
a76428792f Add the ability to display annotations in the generated docs 
(cherry-picked from commit 87c44d8a11)
Bug: 8440225
Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20
 2015-08-10 17:48:08 -07:00
Ying Wang
25a1c48de7 am fd50d4de: am a1655645: am edf7bf8d: Merge "Allow custom recovery resource dirs." 
* commit 'fd50d4dec3e57ebf1877021a242659b668788a95':
  Allow custom recovery resource dirs.
 2015-08-10 22:31:02 +00:00
Ying Wang
fd50d4dec3 am a1655645: am edf7bf8d: Merge "Allow custom recovery resource dirs." 
* commit 'a16556450c53c18d49fa55ad2a5f08880f997e04':
  Allow custom recovery resource dirs.
 2015-08-10 22:27:01 +00:00
Ying Wang
a16556450c am edf7bf8d: Merge "Allow custom recovery resource dirs." 
* commit 'edf7bf8d832fdd2356cb68519b8e717acde94e5b':
  Allow custom recovery resource dirs.
 2015-08-10 22:23:10 +00:00
Ying Wang
edf7bf8d83 Merge "Allow custom recovery resource dirs." 2015-08-10 22:15:23 +00:00
Dan Albert
75c9fb9864 am 070961e6: am 96f480c9: am 4f20869b: Merge "Bump the default C++ standard up to C++14." 
* commit '070961e6f2b462367dea3b3e2ad50259fbcf29fc':
  Bump the default C++ standard up to C++14.
 2015-08-10 21:02:12 +00:00
Dan Albert
070961e6f2 am 96f480c9: am 4f20869b: Merge "Bump the default C++ standard up to C++14." 
* commit '96f480c93a318fc6550ef2c4d13e6e67574bfb96':
  Bump the default C++ standard up to C++14.
 2015-08-10 20:54:01 +00:00
Dan Albert
96f480c93a am 4f20869b: Merge "Bump the default C++ standard up to C++14." 
* commit '4f20869b1faa07ee0f615ee9087b91ef11e2d6e4':
  Bump the default C++ standard up to C++14.
 2015-08-10 20:48:48 +00:00
Dan Albert
4f20869b1f Merge "Bump the default C++ standard up to C++14." 2015-08-10 20:40:00 +00:00
Dan Albert
c7d307d873 Bump the default C++ standard up to C++14. 
This also drops the NDK default back to C++98 (or C++11 for code using
libc++). The platform NDK build should match the normal NDK build.

Bug: http://b/23043421
Change-Id: I3a336767ce271e84f4dfdebdadb3a98e5689def9
 2015-08-10 13:37:42 -07:00
Furquan Shaikh
72be668fef am d7ebf9ac: am 7bb7a5f9: am f8a714ba: am 9f5c487e: Merge "releasetools: Fix parameters for vboot_signer" into mnc-dr-dev 
* commit 'd7ebf9acfc4067199600fe32607106f8c4dafdb7':
  releasetools: Fix parameters for vboot_signer
 2015-08-10 20:33:40 +00:00
Furquan Shaikh
d7ebf9acfc am 7bb7a5f9: am f8a714ba: am 9f5c487e: Merge "releasetools: Fix parameters for vboot_signer" into mnc-dr-dev 
* commit '7bb7a5f94e8a2f1f61156773fc259cf112261803':
  releasetools: Fix parameters for vboot_signer
 2015-08-10 20:26:27 +00:00