Commit graph

18262 commits

Author SHA1 Message Date
Elliott Hughes
e972f9ffc0 am 0dbcff95: Merge "The generic_arm64 system image is full."
* commit '0dbcff9599be1f999df467b7d17b4f2785a8452a':
  The generic_arm64 system image is full.
2014-05-20 23:36:30 +00:00
Christopher Ferris
965f39190c am a2cd924b: Merge "Fix extra/missing : in path setup."
* commit 'a2cd924bef556cb6ceccca1098cae338d37200a6':
  Fix extra/missing : in path setup.
2014-05-20 23:36:28 +00:00
Ying Wang
6efad2e0f0 Merge "Fix typo." 2014-05-20 23:21:36 +00:00
Ying Wang
80b91d9ac6 Fix typo.
Change-Id: I027b91d3a89de12a9c9f95406274726574bc7f7a
2014-05-20 16:20:44 -07:00
Yuncheol Heo
24b701ca67 Merge "Fix the path for findbugs." 2014-05-20 22:50:06 +00:00
The Android Automerger
ec1c9732f1 AAV50C 2014-05-20 15:33:49 -07:00
The Android Automerger
9a817b1822 "AAV50B" 2014-05-20 15:00:03 -07:00
Elliott Hughes
0dbcff9599 Merge "The generic_arm64 system image is full." 2014-05-20 21:48:10 +00:00
Elliott Hughes
0499399231 The generic_arm64 system image is full.
Change-Id: I454c674033525f2f7847d2c91979dff8093c335b
2014-05-20 14:44:26 -07:00
Christopher Ferris
a2cd924bef Merge "Fix extra/missing : in path setup." 2014-05-20 21:18:51 +00:00
Christopher Ferris
7110f241ab Fix extra/missing : in path setup.
Change-Id: I4d95efc781c58af704012922d95841e009bf6286
2014-05-20 14:09:36 -07:00
Scott Main
7b93f1e506 am 29498430: am a8fcb35e: am e0968f0e: am c426499e: add 2x version of logo for sticky bar
* commit '29498430029f5a4925e37db4abbf8b6fde4d6f4d':
  add 2x version of logo for sticky bar
2014-05-20 18:16:17 +00:00
Ben Cheng
35dcb507f7 am dfec8f89: am 50e99111: am 54bea362: Merge "Use aarch64-linux-android-4.9 for arm64 build (attempt #4)"
* commit 'dfec8f8915ea5870c5e43549a1230d33585b6d89':
  Use aarch64-linux-android-4.9 for arm64 build (attempt #4)
2014-05-20 18:16:12 +00:00
Ben Murdoch
fe7b5c04dd am fac17e16: am 0861ed07: Merge "Have core_tiny depend on the NullWebView." into klp-modular-dev
* commit 'fac17e16a5ffd46d2f649e4b230503acb6013431':
  Have core_tiny depend on the NullWebView.
2014-05-20 18:15:42 +00:00
Ben Murdoch
a9136595b8 am 527ce064: am cf8cd38f: Merge "All devices that depend on WebView must have the system feature." into klp-modular-dev
* commit '527ce064c9c68affd1fc08f982f0850789ba4c89':
  All devices that depend on WebView must have the system feature.
2014-05-20 18:15:41 +00:00
Scott Main
2949843002 am a8fcb35e: am e0968f0e: am c426499e: add 2x version of logo for sticky bar
* commit 'a8fcb35ec1901194fe82ba3d1054c1a919e2c1d2':
  add 2x version of logo for sticky bar
2014-05-20 17:21:55 +00:00
Scott Main
a8fcb35ec1 am e0968f0e: am c426499e: add 2x version of logo for sticky bar
* commit 'e0968f0e7027f894f3ff5a630720f12016d7202b':
  add 2x version of logo for sticky bar
2014-05-20 17:19:22 +00:00
Scott Main
e0968f0e70 am c426499e: add 2x version of logo for sticky bar
* commit 'c426499ee8e8a3f6df85e46930a6c5aec9cf3d25':
  add 2x version of logo for sticky bar
2014-05-20 17:16:03 +00:00
Scott Main
c426499ee8 add 2x version of logo for sticky bar
Change-Id: I5127d308ee820d4e77798ebe4aaa0f385b797383
2014-05-20 10:11:17 -07:00
Ben Cheng
dfec8f8915 am 50e99111: am 54bea362: Merge "Use aarch64-linux-android-4.9 for arm64 build (attempt #4)"
* commit '50e99111795af08c7a9c687da6680554c2b54f80':
  Use aarch64-linux-android-4.9 for arm64 build (attempt #4)
2014-05-20 16:08:07 +00:00
Ben Cheng
50e9911179 am 54bea362: Merge "Use aarch64-linux-android-4.9 for arm64 build (attempt #4)"
* commit '54bea362ab7f33791bd6ea54d77a76dc8d9e005d':
  Use aarch64-linux-android-4.9 for arm64 build (attempt #4)
2014-05-20 16:04:17 +00:00
Ben Cheng
54bea362ab Merge "Use aarch64-linux-android-4.9 for arm64 build (attempt #4)" 2014-05-20 16:00:08 +00:00
The Android Automerger
0a367c7acc "AAV50" 2014-05-20 05:52:31 -07:00
The Android Automerger
65608a7e1b merge in master-release history after reset to ce43185343 2014-05-20 05:49:20 -07:00
Ben Murdoch
fac17e16a5 am 0861ed07: Merge "Have core_tiny depend on the NullWebView." into klp-modular-dev
* commit '0861ed07f0ef1583ed17dfbfba3ad31c8e50121e':
  Have core_tiny depend on the NullWebView.
2014-05-20 11:10:16 +00:00
Ben Murdoch
527ce064c9 am cf8cd38f: Merge "All devices that depend on WebView must have the system feature." into klp-modular-dev
* commit 'cf8cd38fac91d4d04d12ba0e7494809577fe0ceb':
  All devices that depend on WebView must have the system feature.
2014-05-20 11:10:15 +00:00
Ben Murdoch
0861ed07f0 Merge "Have core_tiny depend on the NullWebView." into klp-modular-dev 2014-05-20 11:06:35 +00:00
Ben Murdoch
cf8cd38fac Merge "All devices that depend on WebView must have the system feature." into klp-modular-dev 2014-05-20 11:06:08 +00:00
Yuncheol Heo
623d706253 Fix the path for findbugs.
Change-Id: I45485f1aeaf7fc3db2839f42829278d8c0ec97e3
2014-05-20 17:13:34 +09:00
Ying Wang
ce43185343 Merge "Explicit record the modules' built-file:installed-file" 2014-05-19 23:57:27 +00:00
The Android Automerger
ac83af535c "AAV49B" 2014-05-19 16:25:17 -07:00
Geremy Condra
6a4b1c4576 Fix salt for verity tree generation.
Prior to this change salts were randomly generated, causing OTAs
to fail when they tried to check whether the system they were
installing on was binary identical to the source from which they
were generated.

Bug: 15018770
Change-Id: I86fffe2264a0c263aaf47112fb82fa71240e3403
2014-05-19 16:24:39 -07:00
Ben Cheng
d033121431 Use aarch64-linux-android-4.9 for arm64 build (attempt #4)
GCC: 4.9 (which supports -fstack-protector)
Binutils: 2.24 (which supports gc-sections)
GDB: 7.7

NDK libraries are still picked up from prebuilts/ndk/*/4.8/*

GCC has been patched to disable codegen for calling
__cxa_throw_bad_array_new_length.

Source code has been sync'ed against the 2014-05-14 snapshot which
contains many important fixes (devirtualization, codegen, ...).

Change-Id: I43229360ad0132193d5208cb0d1acba55084853c
2014-05-19 16:22:21 -07:00
Ye Wen
bd78847647 Merge "MMS API: build file change to add MmsService" 2014-05-19 22:52:11 +00:00
Ying Wang
3380d3a1ae Explicit record the modules' built-file:installed-file
- This simplifies the logic to get the mapping of built-file to
  installed-file. Previously we used file suffix matching which is error
  prone and not scalable.
- With this change the .odex files will be included automatically.

Bug: 13585955
Change-Id: I4599abf93b9d501bac7aca7758d7f3aee21b3e36
2014-05-19 13:03:36 -07:00
Dirk Dougherty
9b9b98376a am 7a62e01c: am 63168fff: am b4cb3ebc: am ca1230c9: Minor fixes for handling cross-browser load issues and positioning of #headings.
* commit '7a62e01c0baa27d7cff53b4ac4d082710691e8c4':
  Minor fixes for handling cross-browser load issues and positioning of #headings.
2014-05-19 18:23:53 +00:00
Dirk Dougherty
7a62e01c0b am 63168fff: am b4cb3ebc: am ca1230c9: Minor fixes for handling cross-browser load issues and positioning of #headings.
* commit '63168ffff85e8888c003588b4beeab6769d578ed':
  Minor fixes for handling cross-browser load issues and positioning of #headings.
2014-05-19 18:12:52 +00:00
Dirk Dougherty
63168ffff8 am b4cb3ebc: am ca1230c9: Minor fixes for handling cross-browser load issues and positioning of #headings.
* commit 'b4cb3ebc37423db5dc5b5327999d7efe874d7148':
  Minor fixes for handling cross-browser load issues and positioning of #headings.
2014-05-19 18:08:50 +00:00
Dirk Dougherty
b4cb3ebc37 am ca1230c9: Minor fixes for handling cross-browser load issues and positioning of #headings.
* commit 'ca1230c9a251fd0eaf68665c424a69442f717df1':
  Minor fixes for handling cross-browser load issues and positioning of #headings.
2014-05-19 17:24:15 +00:00
Geremy Condra
961e316223 Merge "Fix salt for verity tree generation." 2014-05-19 17:20:24 +00:00
Brian Carlstrom
8d422a3a0b am 8074ff4d: am a8355eca: am 64f3a191: Merge "Multilib support for odex"
* commit '8074ff4d0f962a933586b9809d1f1bdffe1fe5ed':
  Multilib support for odex
2014-05-19 17:04:54 +00:00
Ji-Hwan Lee
d9af5a5458 am d9f11a3f: am c0f0e8ca: am 13b48588: Merge "Allow qemu_device read-write access to various processes"
* commit 'd9f11a3f2b0670ac68bfae782c5fe8c58032efc6':
  Allow qemu_device read-write access to various processes
2014-05-19 17:01:10 +00:00
Brian Carlstrom
8074ff4d0f am a8355eca: am 64f3a191: Merge "Multilib support for odex"
* commit 'a8355ecaadf9a0d052165d0cc14564927eb9a202':
  Multilib support for odex
2014-05-19 16:59:16 +00:00
Brian Carlstrom
a8355ecaad am 64f3a191: Merge "Multilib support for odex"
* commit '64f3a191f92a6ab84a8175ad480633b8c58ac900':
  Multilib support for odex
2014-05-19 16:53:35 +00:00
Ji-Hwan Lee
d9f11a3f2b am c0f0e8ca: am 13b48588: Merge "Allow qemu_device read-write access to various processes"
* commit 'c0f0e8cab7268d372b5bded8b141133c2257f964':
  Allow qemu_device read-write access to various processes
2014-05-19 16:52:15 +00:00
Brian Carlstrom
64f3a191f9 Merge "Multilib support for odex" 2014-05-19 16:50:17 +00:00
Ji-Hwan Lee
c0f0e8cab7 am 13b48588: Merge "Allow qemu_device read-write access to various processes"
* commit '13b485889d95597a839f27f7774d55142bb8b5a7':
  Allow qemu_device read-write access to various processes
2014-05-19 16:48:51 +00:00
Ji-Hwan Lee
13b485889d Merge "Allow qemu_device read-write access to various processes" 2014-05-19 16:46:30 +00:00
The Android Automerger
8ad86ae993 "AAV49" 2014-05-19 05:51:00 -07:00
The Android Automerger
ffa92b25d1 merge in master-release history after reset to 6772438d92 2014-05-19 05:49:14 -07:00