Mark Salyzyn
86997b8809
am defa1737
: am b37ac46b
: Merge "goldfish: logcat -Q in logd domain"
...
* commit 'defa1737973575e3be2dce415c68c6b13fb4fbd0':
goldfish: logcat -Q in logd domain
2015-06-03 17:43:28 +00:00
Mark Salyzyn
defa173797
am b37ac46b
: Merge "goldfish: logcat -Q in logd domain"
...
* commit 'b37ac46bb40e24b1014010735abc5e63802ca3bb':
goldfish: logcat -Q in logd domain
2015-06-03 16:00:46 +00:00
Mark Salyzyn
b37ac46bb4
Merge "goldfish: logcat -Q in logd domain"
2015-06-03 15:47:18 +00:00
Mark Salyzyn
1cc7735ffa
goldfish: logcat -Q in logd domain
...
Deal with a build failure in conflict with cl/152105
Bug: 19608716
Change-Id: I1078046db3b159c1baf0a22435c3e777424453a1
2015-06-03 07:52:21 -07:00
Tao Bao
26038fbb2c
am 60dd04ec
: Merge "Add post-install verification for BBOTAs" into mnc-dev
...
* commit '60dd04ecfc94bd732c72287349f2fb910a0bbbef':
Add post-install verification for BBOTAs
2015-06-02 21:09:12 +00:00
Tao Bao
87742421b2
am 2e30a5e8
: am 708c4623
: Merge "Add post-install verification for BBOTAs"
...
* commit '2e30a5e853a584b11db65c0703aff93c7f7870f8':
Add post-install verification for BBOTAs
2015-06-02 18:28:30 +00:00
Tao Bao
60dd04ecfc
Merge "Add post-install verification for BBOTAs" into mnc-dev
2015-06-02 18:28:25 +00:00
Tao Bao
5fcaaeffc3
Add post-install verification for BBOTAs
...
Similar to the assertations in file-based OTA, we perform verification
for block-based OTAs (BBOTAs) after updating a partition, for both of
the incremental and full OTAs. It increases the update time (~20s on
Nexus 6), but will capture unnoticed errors right away.
Bug: 21500869
Change-Id: I0f8b27734caaa0f41f9c1b904d55af2112784a68
(cherry picked from commit 68658c0f4f
)
2015-06-02 11:15:33 -07:00
Tao Bao
2e30a5e853
am 708c4623
: Merge "Add post-install verification for BBOTAs"
...
* commit '708c462311afd63592a3adcc0e47c0c850b73444':
Add post-install verification for BBOTAs
2015-06-02 18:14:40 +00:00
Tao Bao
708c462311
Merge "Add post-install verification for BBOTAs"
2015-06-02 18:02:28 +00:00
Yohann Roussel
16ee5345a8
am a9dd74c3
: Merge "Add support for RMTYPEDEF with Jack" into mnc-dev
...
* commit 'a9dd74c39515759599a3b01f7772de9f19325800':
Add support for RMTYPEDEF with Jack
2015-06-02 14:24:53 +00:00
Andrew Hsieh
4c0cd7534b
am d760d467
: Revert "Revert "Enable linker -fix-cortex-a53-843419""
...
* commit 'd760d4676bb50ce74e4cc9a2813c592c189d31c9':
Revert "Revert "Enable linker -fix-cortex-a53-843419""
2015-06-02 14:24:12 +00:00
Yohann Roussel
36bf23ddce
am 546e6205
: (-s ours) am ea6de994
: (-s ours) Merge "[DO NOT MERGE] Add support for RMTYPEDEF with Jack"
...
* commit '546e62054cf5a2a352d79f33d06ce96dcaa91731':
[DO NOT MERGE] Add support for RMTYPEDEF with Jack
2015-06-02 13:17:09 +00:00
Yohann Roussel
546e62054c
am ea6de994
: (-s ours) Merge "[DO NOT MERGE] Add support for RMTYPEDEF with Jack"
...
* commit 'ea6de994788bf90559ee75fc638328aa90d6853b':
[DO NOT MERGE] Add support for RMTYPEDEF with Jack
2015-06-02 13:07:52 +00:00
Yohann Roussel
ea6de99478
Merge "[DO NOT MERGE] Add support for RMTYPEDEF with Jack"
2015-06-02 12:58:38 +00:00
Yohann Roussel
b518c3ec0b
[DO NOT MERGE] Add support for RMTYPEDEF with Jack
...
Bug: 21099584
(cherry-picked from commit 5b2c6e26db
)
Change-Id: I39aa1f24780c216e978ef743098ca7ac65b2962e
2015-06-02 12:25:51 +02:00
Yohann Roussel
a9dd74c395
Merge "Add support for RMTYPEDEF with Jack" into mnc-dev
2015-06-02 09:36:27 +00:00
Andrew Hsieh
d760d4676b
Revert "Revert "Enable linker -fix-cortex-a53-843419""
...
This reverts commit 32e1689684
.
Now that prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9 is also updated
Change-Id: Id95c1c4cc651c434461655e62b8f23afd56b53e4
2015-06-02 07:59:24 +08:00
Tao Bao
68658c0f4f
Add post-install verification for BBOTAs
...
Similar to the assertations in file-based OTA, we perform verification
for block-based OTAs (BBOTAs) after updating a partition, for both of
the incremental and full OTAs. It increases the update time (~20s on
Nexus 6), but will capture unnoticed errors right away.
Bug: 21500869
Change-Id: I89ac8fe623b855721b7affd07cf9426a23433ab0
2015-06-01 15:00:30 -07:00
Clay Murphy
fee593b266
am 2094344f
: am b7bb040c
: Merge "Docs: Update link to new Community page location"
...
* commit '2094344fb3b35a6d2bae227e65946515e5fea84a':
Docs: Update link to new Community page location
2015-06-01 19:29:07 +00:00
Clay Murphy
2094344fb3
am b7bb040c
: Merge "Docs: Update link to new Community page location"
...
* commit 'b7bb040c75922795b47434e09cd09842ad11fd46':
Docs: Update link to new Community page location
2015-06-01 19:16:46 +00:00
Clay Murphy
b7bb040c75
Merge "Docs: Update link to new Community page location"
2015-06-01 19:04:56 +00:00
Ying Wang
e967f70876
am 4fe7bfd3
: Add /lib[64] to host binary\'s rpath.
...
* commit '4fe7bfd373d99dedfd2e63135da5189478bb0138':
Add $ORIGIN/lib[64] to host binary's rpath.
2015-06-01 18:51:57 +00:00
Ying Wang
f4710290bf
am 9cc3b757
: am 91c2f705
: Merge "Add /lib[64] to host binary\'s rpath."
...
* commit '9cc3b7572c29184d77f477df2b0376fc2f4b589a':
Add $ORIGIN/lib[64] to host binary's rpath.
2015-06-01 18:50:00 +00:00
Ying Wang
9cc3b7572c
am 91c2f705
: Merge "Add /lib[64] to host binary\'s rpath."
...
* commit '91c2f7053d131cb9449eccfda97ec80130dbf451':
Add $ORIGIN/lib[64] to host binary's rpath.
2015-06-01 18:37:12 +00:00
Ying Wang
91c2f7053d
Merge "Add $ORIGIN/lib[64] to host binary's rpath."
2015-06-01 18:29:14 +00:00
Ying Wang
30127bfdad
Add $ORIGIN/lib[64] to host binary's rpath.
...
Normally the binaries use the exsiting $ORIGIN/../lib[64] with binaries
in the bin subdirectory;
For historical reason the binaries in the SDK package don't have a bin
subdirectory. This workaround enables them to work in the existing SDK
directory structure.
Bug: 21301578
Change-Id: Ibebfbfb8b30e81e7bbaf13a21bb205f3f0282d24
(cherry-pick from commit 4fe7bfd373
)
2015-06-01 11:28:02 -07:00
Ying Wang
4fe7bfd373
Add $ORIGIN/lib[64] to host binary's rpath.
...
Normally the binaries use the exsiting $ORIGIN/../lib[64] with binaries
in the bin subdirectory;
For historical reason the binaries in the SDK package don't have a bin
subdirectory. This workaround enables them to work in the exsiting SDK
directory structure.
Bug: 21301578
Change-Id: Ibebfbfb8b30e81e7bbaf13a21bb205f3f0282d24
2015-06-01 10:43:29 -07:00
Chih-Hung Hsieh
3e50545fc9
am ad2494bb
: Remove gcc 4.9 workaround.
...
* commit 'ad2494bb79932c4f2fd55f51e9b0d58676502558':
Remove gcc 4.9 workaround.
2015-06-01 15:27:08 +00:00
Chih-Hung Hsieh
e9bf6e7750
am 8b79abfb
: am c2be68e4
: Merge "Remove gcc 4.9 workaround."
...
* commit '8b79abfb4458193ee28949882a712b03e7828c53':
Remove gcc 4.9 workaround.
2015-05-29 20:36:19 +00:00
Chih-Hung Hsieh
8b79abfb44
am c2be68e4
: Merge "Remove gcc 4.9 workaround."
...
* commit 'c2be68e4f688f61ea5c23183b8eaeb4e34aa1c56':
Remove gcc 4.9 workaround.
2015-05-29 20:28:08 +00:00
Chih-Hung Hsieh
c2be68e4f6
Merge "Remove gcc 4.9 workaround."
2015-05-29 20:16:23 +00:00
Chih-Hung Hsieh
128d51e67e
Remove gcc 4.9 workaround.
...
The gcc 4.9 devirtualization bug was fixed with a cherry pick of r212222.
BUG: 19872411
Change-Id: I6d9677f112402fe84d70da770f364392398e9cc9
(cherry picked from commit ad2494bb79
)
2015-05-29 12:06:36 -07:00
Chih-Hung Hsieh
ad2494bb79
Remove gcc 4.9 workaround.
...
The gcc 4.9 devirtualization bug was fixed with a cherry pick of r212222.
BUG: 19872411
Change-Id: I6d9677f112402fe84d70da770f364392398e9cc9
2015-05-29 10:27:58 -07:00
Ying Wang
0930bcec39
am d4109350
: am 6106f320
: Merge "Do not add \'adb\' to persist.sys.usb.config if already there"
...
* commit 'd41093507b4e417b23e5172d11319312ce6c3add':
Do not add 'adb' to persist.sys.usb.config if already there
2015-05-29 17:24:08 +00:00
Ying Wang
d41093507b
am 6106f320
: Merge "Do not add \'adb\' to persist.sys.usb.config if already there"
...
* commit '6106f320d3cf4b76774046faf2d843c5b13db593':
Do not add 'adb' to persist.sys.usb.config if already there
2015-05-29 17:09:13 +00:00
Ying Wang
6106f320d3
Merge "Do not add 'adb' to persist.sys.usb.config if already there"
2015-05-29 16:55:05 +00:00
Oreste Salerno
420e341a36
Do not add 'adb' to persist.sys.usb.config if already there
...
The 'adb' configuration might have already been added by a
device-specific Makefile, so add it only if it's not already there.
Change-Id: I6f96645f44c96f6f827cc8c842a8b769f92be13a
2015-05-29 07:46:40 +00:00
Elliott Hughes
9b7356cc6d
am a6b14661
: am 1a81a0ef
: Merge "[MIPS] Do not use compact branches until GDB supports them"
...
* commit 'a6b14661687d8da6a8f566dd2fb104986b411565':
[MIPS] Do not use compact branches until GDB supports them
2015-05-29 05:07:20 +00:00
Christopher Ferris
4c4db2d809
am ce78cf40
: am 6bd0bbd5
: Merge "Portable way to color"
...
* commit 'ce78cf40a4dbdfe2644215102c1269a4e72bec8b':
Portable way to color
2015-05-29 05:07:18 +00:00
Elliott Hughes
a6b1466168
am 1a81a0ef
: Merge "[MIPS] Do not use compact branches until GDB supports them"
...
* commit '1a81a0efca84990648a0b0f023b8a270226303ae':
[MIPS] Do not use compact branches until GDB supports them
2015-05-29 04:54:33 +00:00
Elliott Hughes
1a81a0efca
Merge "[MIPS] Do not use compact branches until GDB supports them"
2015-05-29 04:41:27 +00:00
Dirk Dougherty
83e289e039
am bdbf0741
: am f89524c8
: am 6c231420
: Merge "increment metadata versions." into mnc-preview-docs
...
* commit 'bdbf074186275fcfbe90293fc1da26da837fd32d':
increment metadata versions.
2015-05-28 22:35:53 +00:00
Dirk Dougherty
cc194d5852
am b9c10368
: am fa370efd
: am 11d3d486
: Increment css versions for appengine\'s benefit.
...
* commit 'b9c103680edf7ad7c68997ef7ac5b021442a2849':
Increment css versions for appengine's benefit.
2015-05-28 22:35:04 +00:00
Jeff Sharkey
c79068be5c
am c2fb6e10
: Merge "Both ext4 and f2fs binaries for adoptable storage." into mnc-dev
...
* commit 'c2fb6e107d81e50a58fe25073f490b9dd48b31e2':
Both ext4 and f2fs binaries for adoptable storage.
2015-05-28 22:34:32 +00:00
Christopher Ferris
ce78cf40a4
am 6bd0bbd5
: Merge "Portable way to color"
...
* commit '6bd0bbd5ebf059affcb826dc7a4a874bae0b09c4':
Portable way to color
2015-05-28 22:30:55 +00:00
Christopher Ferris
6bd0bbd5eb
Merge "Portable way to color"
2015-05-28 22:00:09 +00:00
Dirk Dougherty
bdbf074186
am f89524c8
: am 6c231420
: Merge "increment metadata versions." into mnc-preview-docs
...
* commit 'f89524c80bb2fa6550fff1ff3bed6a257a80f64a':
increment metadata versions.
2015-05-28 21:36:26 +00:00
Dirk Dougherty
f89524c80b
am 6c231420
: Merge "increment metadata versions." into mnc-preview-docs
...
* commit '6c2314206fd4500500062fa2f774d4deb498ec58':
increment metadata versions.
2015-05-28 21:24:53 +00:00
Dirk Dougherty
6c2314206f
Merge "increment metadata versions." into mnc-preview-docs
2015-05-28 21:07:43 +00:00