Commit graph

17707 commits

Author SHA1 Message Date
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
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
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
Ying Wang
ce43185343 Merge "Explicit record the modules' built-file:installed-file" 2014-05-19 23:57:27 +00: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
Ji-Hwan Lee
93e450767f Allow qemu_device read-write access to various processes
Basically, allow access of qemu_device where gpu_device is allowed, for the
case when the emulator runs with OpenGL/ES emulation.  Most noticably,
surfaceflinger crashes without qemu_device access.

Bug: 15052949
Change-Id: Ib891365a6d503309bced64e2512c4d8f29d9a07e
2014-05-19 20:49:17 +09:00
Ben Murdoch
0b4abb9a77 Have core_tiny depend on the NullWebView.
Tiny devices do not support a functioning WebView.

Depends on I6afa169fa31db82c45c0a507e265301e48ac79dc

Bug: 13438487
Change-Id: I5f6e115ee569848d0494e0dd52ef037e3a0ee84e
2014-05-19 11:09:53 +00:00
Dirk Dougherty
ca1230c9a2 Minor fixes for handling cross-browser load issues and positioning of #headings.
Change-Id: I276b07cd85cc0e1edaede027b3dc3e4b1d24dcd7
2014-05-18 22:10:43 -07:00
Ying Wang
b9aa5d43de Multilib support for odex
If the VM is libart and DEXPREOPT is enabled,
- For a Java library and the boot image, we build for both 1st arch and
  2nd arch.
- For an app, we build for the multilib arch the module is targeted for.
The odex file will be in <arch_name>/<module_name>.odex inside the same
dir where the jar/apk file gets installed.
Nothing changed if it's built for libdvm.

Bug: 14694978
Change-Id: I45118a83758b41d52d6c9e38f93f0ba2775a6c74
2014-05-18 22:04:58 -07:00
Ji-Hwan Lee
6772438d92 am fff1b6d8: am 744e4aa2: am e624fd28: Merge "Put prebuilt emulator path after host output"
* commit 'fff1b6d80002d83c0db5c426961780f58b7391df':
  Put prebuilt emulator path after host output
2014-05-18 07:58:12 +00:00
Ji-Hwan Lee
b32ea89a6a am 38c18c3b: am acfb2723: am c60783c9: Merge "Increase system image size to 650M for generic_arm64"
* commit '38c18c3b9adca416517fb332628253e2bb43fe23':
  Increase system image size to 650M for generic_arm64
2014-05-18 07:58:11 +00:00
Ji-Hwan Lee
fff1b6d800 am 744e4aa2: am e624fd28: Merge "Put prebuilt emulator path after host output"
* commit '744e4aa228b4ad25d444acb020ee3816fd2c2eb1':
  Put prebuilt emulator path after host output
2014-05-18 07:18:27 +00:00
Ji-Hwan Lee
38c18c3b9a am acfb2723: am c60783c9: Merge "Increase system image size to 650M for generic_arm64"
* commit 'acfb27236cb02102d74fd52316c5b72d6ed79591':
  Increase system image size to 650M for generic_arm64
2014-05-18 07:18:26 +00:00
Ji-Hwan Lee
744e4aa228 am e624fd28: Merge "Put prebuilt emulator path after host output"
* commit 'e624fd281a74b42828a1902dfff11503f95fe28d':
  Put prebuilt emulator path after host output
2014-05-18 06:50:32 +00:00
Ji-Hwan Lee
acfb27236c am c60783c9: Merge "Increase system image size to 650M for generic_arm64"
* commit 'c60783c9a291dc03a11326caac920c295ed999dc':
  Increase system image size to 650M for generic_arm64
2014-05-18 06:50:32 +00:00
Ji-Hwan Lee
e624fd281a Merge "Put prebuilt emulator path after host output" 2014-05-18 06:39:50 +00:00
Ji-Hwan Lee
c60783c9a2 Merge "Increase system image size to 650M for generic_arm64" 2014-05-18 06:38:17 +00:00
Ji-Hwan Lee
c89e1826ba Increase system image size to 650M for generic_arm64
Change-Id: I7969ec54dc4225bbe36651c4d9c6a09de1eb89f4
2014-05-18 02:42:14 +09:00
Ying Wang
a27da32b69 am e75315fd: am 002f3c28: am 4636abe5: Merge "Real "LOCAL_MULTILIB := both" for prebuilts"
* commit 'e75315fdef200600f280f829089fd8d32e662b2e':
  Real "LOCAL_MULTILIB := both" for prebuilts
2014-05-17 03:13:51 +00:00
Ying Wang
e75315fdef am 002f3c28: am 4636abe5: Merge "Real "LOCAL_MULTILIB := both" for prebuilts"
* commit '002f3c28629b8ee84d0a54fe9f2de745e965b9dc':
  Real "LOCAL_MULTILIB := both" for prebuilts
2014-05-17 03:08:26 +00:00
Ying Wang
002f3c2862 am 4636abe5: Merge "Real "LOCAL_MULTILIB := both" for prebuilts"
* commit '4636abe5899272e1e9051e2c98516409107c4e8c':
  Real "LOCAL_MULTILIB := both" for prebuilts
2014-05-17 03:06:42 +00:00
Ying Wang
4636abe589 Merge "Real "LOCAL_MULTILIB := both" for prebuilts" 2014-05-17 03:03:44 +00:00
Geremy Condra
e8e982afd3 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-16 19:14:30 -07:00
Ying Wang
5415835c41 am 5989a051: am 023209b6: am 5ee3f096: Merge "Default TARGET_CPU_SMP to true."
* commit '5989a05130ff3cd4a789afb2fd09e9f03a58bc3c':
  Default TARGET_CPU_SMP to true.
2014-05-17 00:16:07 +00:00
Ying Wang
5989a05130 am 023209b6: am 5ee3f096: Merge "Default TARGET_CPU_SMP to true."
* commit '023209b63ee4be4289b3e07b3c3dc54773523094':
  Default TARGET_CPU_SMP to true.
2014-05-17 00:12:50 +00:00
Ying Wang
023209b63e am 5ee3f096: Merge "Default TARGET_CPU_SMP to true."
* commit '5ee3f0960dbc6a14333e3b98252d59f5d8d18a7d':
  Default TARGET_CPU_SMP to true.
2014-05-17 00:09:03 +00:00
Ying Wang
5ee3f0960d Merge "Default TARGET_CPU_SMP to true." 2014-05-17 00:07:16 +00:00
Ying Wang
f1d722ba40 am fb71a59e: am 11278626: am 3c8089ce: Merge "Fix the missing 2nd arch prefix."
* commit 'fb71a59ef79d22c1acaf4a57980bc932886821cb':
  Fix the missing 2nd arch prefix.
2014-05-16 23:33:45 +00:00