OSDN Git Service

android-x86/build.git
10 years agoBuild EthernetService.
Lorenzo Colitti [Wed, 21 May 2014 02:59:10 +0000 (19:59 -0700)]
Build EthernetService.

This is included in the PRODUCT_BOOT_JARS because it needs to be
loaded by system_server via SystemServiceManager.startService,
which only looks at the boot classpath.

This is compiled on all devices as opposed to only devices with
a physical Ethernet port because we also support Ethernet over
USB.

Change-Id: I55bc422e2a7b700eea4b7513f96079502be36882

10 years agoam 2f4c0a86: am 8a724260: am 4e151105: Merge "Support to extract JNI libs from prebui...
Ying Wang [Wed, 21 May 2014 01:12:15 +0000 (01:12 +0000)]
am 2f4c0a86: am 8a724260: am 4e151105: Merge "Support to extract JNI libs from prebuilt APK"

* commit '2f4c0a8617e75a8aa28ba898c9213422aa7e93f0':
  Support to extract JNI libs from prebuilt APK

10 years agoam 8a724260: am 4e151105: Merge "Support to extract JNI libs from prebuilt APK"
Ying Wang [Wed, 21 May 2014 01:10:15 +0000 (01:10 +0000)]
am 8a724260: am 4e151105: Merge "Support to extract JNI libs from prebuilt APK"

* commit '8a724260f2a3900808e0e733b893a37c119fe3f1':
  Support to extract JNI libs from prebuilt APK

10 years agoam 4e151105: Merge "Support to extract JNI libs from prebuilt APK"
Ying Wang [Wed, 21 May 2014 01:06:03 +0000 (01:06 +0000)]
am 4e151105: Merge "Support to extract JNI libs from prebuilt APK"

* commit '4e151105a02ba09acb277c6a084252d01c561a5f':
  Support to extract JNI libs from prebuilt APK

10 years agoMerge "Support to extract JNI libs from prebuilt APK"
Ying Wang [Wed, 21 May 2014 01:02:57 +0000 (01:02 +0000)]
Merge "Support to extract JNI libs from prebuilt APK"

10 years agoSupport to extract JNI libs from prebuilt APK
Ying Wang [Sat, 19 Apr 2014 03:13:41 +0000 (20:13 -0700)]
Support to extract JNI libs from prebuilt APK

Use LOCAL_PREBUILT_JNI_LIBS to install prebuilt JNI libraries extracted
from the prebuilt apk, or prebuilts as source, to the app specific lib path.
LOCAL_PREBUILT_JNI_LIBS accepts 2 kinds of files:
- Files like @path/to/libfoo.so (path inside the apk) are JNI libs
  extracted from the prebuilt apk. In this case, all embedded JNI libs
  inside the prebuilt apk are stripped.
- Files like path/to/libfoo.so (path relative to LOCAL_PATH) are
  prebuilts in the source tree.

Those prebuilt JNI libs are not defined as modules in the build system,
so this works around possible module name conflict.

Bug: 13170859
Change-Id: I91bb844cc11b3621a85733bc7e8910f168957ef0

10 years agoam d72b3164: am e972f9ff: am 0dbcff95: Merge "The generic_arm64 system image is full."
Elliott Hughes [Wed, 21 May 2014 00:01:45 +0000 (00:01 +0000)]
am d72b3164: am e972f9ff: am 0dbcff95: Merge "The generic_arm64 system image is full."

* commit 'd72b3164bdb731dd9871b221fe8db099a1f94514':
  The generic_arm64 system image is full.

10 years agoam bcbf9ae4: am 965f3919: am a2cd924b: Merge "Fix extra/missing : in path setup."
Christopher Ferris [Wed, 21 May 2014 00:01:44 +0000 (00:01 +0000)]
am bcbf9ae4: am 965f3919: am a2cd924b: Merge "Fix extra/missing : in path setup."

* commit 'bcbf9ae4de41b2cd98ef96f61066496030ef31a1':
  Fix extra/missing : in path setup.

10 years agoam e972f9ff: am 0dbcff95: Merge "The generic_arm64 system image is full."
Elliott Hughes [Tue, 20 May 2014 23:40:01 +0000 (23:40 +0000)]
am e972f9ff: am 0dbcff95: Merge "The generic_arm64 system image is full."

* commit 'e972f9ffc00c09d3071c899c68c5de31dd4d122a':
  The generic_arm64 system image is full.

10 years agoam 965f3919: am a2cd924b: Merge "Fix extra/missing : in path setup."
Christopher Ferris [Tue, 20 May 2014 23:40:00 +0000 (23:40 +0000)]
am 965f3919: am a2cd924b: Merge "Fix extra/missing : in path setup."

* commit '965f39190cb50d97b98d47ba8ca205661cfa2c3d':
  Fix extra/missing : in path setup.

10 years agoam 0dbcff95: Merge "The generic_arm64 system image is full."
Elliott Hughes [Tue, 20 May 2014 23:36:30 +0000 (23:36 +0000)]
am 0dbcff95: Merge "The generic_arm64 system image is full."

* commit '0dbcff9599be1f999df467b7d17b4f2785a8452a':
  The generic_arm64 system image is full.

10 years agoam a2cd924b: Merge "Fix extra/missing : in path setup."
Christopher Ferris [Tue, 20 May 2014 23:36:28 +0000 (23:36 +0000)]
am a2cd924b: Merge "Fix extra/missing : in path setup."

* commit 'a2cd924bef556cb6ceccca1098cae338d37200a6':
  Fix extra/missing : in path setup.

10 years agoMerge "Fix typo."
Ying Wang [Tue, 20 May 2014 23:21:36 +0000 (23:21 +0000)]
Merge "Fix typo."

10 years agoFix typo.
Ying Wang [Tue, 20 May 2014 23:20:44 +0000 (16:20 -0700)]
Fix typo.

Change-Id: I027b91d3a89de12a9c9f95406274726574bc7f7a

10 years agoMerge "Fix the path for findbugs."
Yuncheol Heo [Tue, 20 May 2014 22:50:05 +0000 (22:50 +0000)]
Merge "Fix the path for findbugs."

10 years agoMerge "The generic_arm64 system image is full."
Elliott Hughes [Tue, 20 May 2014 21:48:10 +0000 (21:48 +0000)]
Merge "The generic_arm64 system image is full."

10 years agoThe generic_arm64 system image is full.
Elliott Hughes [Tue, 20 May 2014 21:37:51 +0000 (14:37 -0700)]
The generic_arm64 system image is full.

Change-Id: I454c674033525f2f7847d2c91979dff8093c335b

10 years agoMerge "Fix extra/missing : in path setup."
Christopher Ferris [Tue, 20 May 2014 21:18:50 +0000 (21:18 +0000)]
Merge "Fix extra/missing : in path setup."

10 years agoFix extra/missing : in path setup.
Christopher Ferris [Tue, 20 May 2014 20:56:00 +0000 (13:56 -0700)]
Fix extra/missing : in path setup.

Change-Id: I4d95efc781c58af704012922d95841e009bf6286

10 years agoam 29498430: am a8fcb35e: am e0968f0e: am c426499e: add 2x version of logo for sticky bar
Scott Main [Tue, 20 May 2014 18:16:17 +0000 (18:16 +0000)]
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

10 years agoam dfec8f89: am 50e99111: am 54bea362: Merge "Use aarch64-linux-android-4.9 for arm64...
Ben Cheng [Tue, 20 May 2014 18:16:12 +0000 (18:16 +0000)]
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)

10 years agoam fac17e16: am 0861ed07: Merge "Have core_tiny depend on the NullWebView." into...
Ben Murdoch [Tue, 20 May 2014 18:15:42 +0000 (18:15 +0000)]
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.

10 years agoam 527ce064: am cf8cd38f: Merge "All devices that depend on WebView must have the...
Ben Murdoch [Tue, 20 May 2014 18:15:41 +0000 (18:15 +0000)]
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.

10 years agoam a8fcb35e: am e0968f0e: am c426499e: add 2x version of logo for sticky bar
Scott Main [Tue, 20 May 2014 17:21:55 +0000 (17:21 +0000)]
am a8fcb35e: am e0968f0e: am c426499e: add 2x version of logo for sticky bar

* commit 'a8fcb35ec1901194fe82ba3d1054c1a919e2c1d2':
  add 2x version of logo for sticky bar

10 years agoam e0968f0e: am c426499e: add 2x version of logo for sticky bar
Scott Main [Tue, 20 May 2014 17:19:22 +0000 (17:19 +0000)]
am e0968f0e: am c426499e: add 2x version of logo for sticky bar

* commit 'e0968f0e7027f894f3ff5a630720f12016d7202b':
  add 2x version of logo for sticky bar

10 years agoam c426499e: add 2x version of logo for sticky bar
Scott Main [Tue, 20 May 2014 17:16:03 +0000 (17:16 +0000)]
am c426499e: add 2x version of logo for sticky bar

* commit 'c426499ee8e8a3f6df85e46930a6c5aec9cf3d25':
  add 2x version of logo for sticky bar

10 years agoadd 2x version of logo for sticky bar
Scott Main [Tue, 20 May 2014 17:11:17 +0000 (10:11 -0700)]
add 2x version of logo for sticky bar

Change-Id: I5127d308ee820d4e77798ebe4aaa0f385b797383

10 years agoam 50e99111: am 54bea362: Merge "Use aarch64-linux-android-4.9 for arm64 build (attem...
Ben Cheng [Tue, 20 May 2014 16:08:07 +0000 (16:08 +0000)]
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)

10 years agoam 54bea362: Merge "Use aarch64-linux-android-4.9 for arm64 build (attempt #4)"
Ben Cheng [Tue, 20 May 2014 16:04:17 +0000 (16:04 +0000)]
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)

10 years agoMerge "Use aarch64-linux-android-4.9 for arm64 build (attempt #4)"
Ben Cheng [Tue, 20 May 2014 16:00:07 +0000 (16:00 +0000)]
Merge "Use aarch64-linux-android-4.9 for arm64 build (attempt #4)"

10 years agoam 0861ed07: Merge "Have core_tiny depend on the NullWebView." into klp-modular-dev
Ben Murdoch [Tue, 20 May 2014 11:10:16 +0000 (11:10 +0000)]
am 0861ed07: Merge "Have core_tiny depend on the NullWebView." into klp-modular-dev

* commit '0861ed07f0ef1583ed17dfbfba3ad31c8e50121e':
  Have core_tiny depend on the NullWebView.

10 years agoam cf8cd38f: Merge "All devices that depend on WebView must have the system feature...
Ben Murdoch [Tue, 20 May 2014 11:10:15 +0000 (11:10 +0000)]
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.

10 years agoMerge "Have core_tiny depend on the NullWebView." into klp-modular-dev
Ben Murdoch [Tue, 20 May 2014 11:06:35 +0000 (11:06 +0000)]
Merge "Have core_tiny depend on the NullWebView." into klp-modular-dev

10 years agoMerge "All devices that depend on WebView must have the system feature." into klp...
Ben Murdoch [Tue, 20 May 2014 11:06:07 +0000 (11:06 +0000)]
Merge "All devices that depend on WebView must have the system feature." into klp-modular-dev

10 years agoFix the path for findbugs.
Yuncheol Heo [Tue, 20 May 2014 08:04:16 +0000 (17:04 +0900)]
Fix the path for findbugs.

Change-Id: I45485f1aeaf7fc3db2839f42829278d8c0ec97e3

10 years agoMerge "Explicit record the modules' built-file:installed-file"
Ying Wang [Mon, 19 May 2014 23:57:27 +0000 (23:57 +0000)]
Merge "Explicit record the modules' built-file:installed-file"

10 years agoUse aarch64-linux-android-4.9 for arm64 build (attempt #4)
Ben Cheng [Mon, 19 May 2014 23:22:21 +0000 (16:22 -0700)]
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

10 years agoMerge "MMS API: build file change to add MmsService"
Ye Wen [Mon, 19 May 2014 22:52:10 +0000 (22:52 +0000)]
Merge "MMS API: build file change to add MmsService"

10 years agoExplicit record the modules' built-file:installed-file
Ying Wang [Mon, 19 May 2014 20:03:36 +0000 (13:03 -0700)]
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

10 years agoam 7a62e01c: am 63168fff: am b4cb3ebc: am ca1230c9: Minor fixes for handling cross...
Dirk Dougherty [Mon, 19 May 2014 18:23:53 +0000 (18:23 +0000)]
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.

10 years agoam 63168fff: am b4cb3ebc: am ca1230c9: Minor fixes for handling cross-browser load...
Dirk Dougherty [Mon, 19 May 2014 18:12:52 +0000 (18:12 +0000)]
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.

10 years agoam b4cb3ebc: am ca1230c9: Minor fixes for handling cross-browser load issues and...
Dirk Dougherty [Mon, 19 May 2014 18:08:50 +0000 (18:08 +0000)]
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.

10 years agoam ca1230c9: Minor fixes for handling cross-browser load issues and positioning of...
Dirk Dougherty [Mon, 19 May 2014 17:24:15 +0000 (17:24 +0000)]
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.

10 years agoMerge "Fix salt for verity tree generation."
Geremy Condra [Mon, 19 May 2014 17:20:24 +0000 (17:20 +0000)]
Merge "Fix salt for verity tree generation."

10 years agoam 8074ff4d: am a8355eca: am 64f3a191: Merge "Multilib support for odex"
Brian Carlstrom [Mon, 19 May 2014 17:04:54 +0000 (17:04 +0000)]
am 8074ff4d: am a8355eca: am 64f3a191: Merge "Multilib support for odex"

* commit '8074ff4d0f962a933586b9809d1f1bdffe1fe5ed':
  Multilib support for odex

10 years agoam d9f11a3f: am c0f0e8ca: am 13b48588: Merge "Allow qemu_device read-write access...
Ji-Hwan Lee [Mon, 19 May 2014 17:01:10 +0000 (17:01 +0000)]
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

10 years agoam a8355eca: am 64f3a191: Merge "Multilib support for odex"
Brian Carlstrom [Mon, 19 May 2014 16:59:16 +0000 (16:59 +0000)]
am a8355eca: am 64f3a191: Merge "Multilib support for odex"

* commit 'a8355ecaadf9a0d052165d0cc14564927eb9a202':
  Multilib support for odex

10 years agoam 64f3a191: Merge "Multilib support for odex"
Brian Carlstrom [Mon, 19 May 2014 16:53:35 +0000 (16:53 +0000)]
am 64f3a191: Merge "Multilib support for odex"

* commit '64f3a191f92a6ab84a8175ad480633b8c58ac900':
  Multilib support for odex

10 years agoam c0f0e8ca: am 13b48588: Merge "Allow qemu_device read-write access to various proce...
Ji-Hwan Lee [Mon, 19 May 2014 16:52:15 +0000 (16:52 +0000)]
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

10 years agoMerge "Multilib support for odex"
Brian Carlstrom [Mon, 19 May 2014 16:50:16 +0000 (16:50 +0000)]
Merge "Multilib support for odex"

10 years agoam 13b48588: Merge "Allow qemu_device read-write access to various processes"
Ji-Hwan Lee [Mon, 19 May 2014 16:48:51 +0000 (16:48 +0000)]
am 13b48588: Merge "Allow qemu_device read-write access to various processes"

* commit '13b485889d95597a839f27f7774d55142bb8b5a7':
  Allow qemu_device read-write access to various processes

10 years agoMerge "Allow qemu_device read-write access to various processes"
Ji-Hwan Lee [Mon, 19 May 2014 16:46:30 +0000 (16:46 +0000)]
Merge "Allow qemu_device read-write access to various processes"

10 years agoAllow qemu_device read-write access to various processes
Ji-Hwan Lee [Mon, 19 May 2014 11:43:23 +0000 (20:43 +0900)]
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

10 years agoHave core_tiny depend on the NullWebView.
Ben Murdoch [Fri, 4 Apr 2014 20:22:25 +0000 (21:22 +0100)]
Have core_tiny depend on the NullWebView.

Tiny devices do not support a functioning WebView.

Depends on I6afa169fa31db82c45c0a507e265301e48ac79dc

Bug: 13438487
Change-Id: I5f6e115ee569848d0494e0dd52ef037e3a0ee84e

10 years agoMinor fixes for handling cross-browser load issues and positioning of #headings.
Dirk Dougherty [Thu, 15 May 2014 03:00:03 +0000 (20:00 -0700)]
Minor fixes for handling cross-browser load issues and positioning of #headings.

Change-Id: I276b07cd85cc0e1edaede027b3dc3e4b1d24dcd7

10 years agoMultilib support for odex
Ying Wang [Tue, 13 May 2014 20:57:28 +0000 (13:57 -0700)]
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

10 years agoam fff1b6d8: am 744e4aa2: am e624fd28: Merge "Put prebuilt emulator path after host...
Ji-Hwan Lee [Sun, 18 May 2014 07:58:12 +0000 (07:58 +0000)]
am fff1b6d8: am 744e4aa2: am e624fd28: Merge "Put prebuilt emulator path after host output"

* commit 'fff1b6d80002d83c0db5c426961780f58b7391df':
  Put prebuilt emulator path after host output

10 years agoam 38c18c3b: am acfb2723: am c60783c9: Merge "Increase system image size to 650M...
Ji-Hwan Lee [Sun, 18 May 2014 07:58:11 +0000 (07:58 +0000)]
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

10 years agoam 744e4aa2: am e624fd28: Merge "Put prebuilt emulator path after host output"
Ji-Hwan Lee [Sun, 18 May 2014 07:18:27 +0000 (07:18 +0000)]
am 744e4aa2: am e624fd28: Merge "Put prebuilt emulator path after host output"

* commit '744e4aa228b4ad25d444acb020ee3816fd2c2eb1':
  Put prebuilt emulator path after host output

10 years agoam acfb2723: am c60783c9: Merge "Increase system image size to 650M for generic_arm64"
Ji-Hwan Lee [Sun, 18 May 2014 07:18:26 +0000 (07:18 +0000)]
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

10 years agoam e624fd28: Merge "Put prebuilt emulator path after host output"
Ji-Hwan Lee [Sun, 18 May 2014 06:50:32 +0000 (06:50 +0000)]
am e624fd28: Merge "Put prebuilt emulator path after host output"

* commit 'e624fd281a74b42828a1902dfff11503f95fe28d':
  Put prebuilt emulator path after host output

10 years agoam c60783c9: Merge "Increase system image size to 650M for generic_arm64"
Ji-Hwan Lee [Sun, 18 May 2014 06:50:32 +0000 (06:50 +0000)]
am c60783c9: Merge "Increase system image size to 650M for generic_arm64"

* commit 'c60783c9a291dc03a11326caac920c295ed999dc':
  Increase system image size to 650M for generic_arm64

10 years agoMerge "Put prebuilt emulator path after host output"
Ji-Hwan Lee [Sun, 18 May 2014 06:39:50 +0000 (06:39 +0000)]
Merge "Put prebuilt emulator path after host output"

10 years agoMerge "Increase system image size to 650M for generic_arm64"
Ji-Hwan Lee [Sun, 18 May 2014 06:38:16 +0000 (06:38 +0000)]
Merge "Increase system image size to 650M for generic_arm64"

10 years agoIncrease system image size to 650M for generic_arm64
Ji-Hwan Lee [Sat, 17 May 2014 17:41:41 +0000 (02:41 +0900)]
Increase system image size to 650M for generic_arm64

Change-Id: I7969ec54dc4225bbe36651c4d9c6a09de1eb89f4

10 years agoam e75315fd: am 002f3c28: am 4636abe5: Merge "Real "LOCAL_MULTILIB := both" for prebu...
Ying Wang [Sat, 17 May 2014 03:13:51 +0000 (03:13 +0000)]
am e75315fd: am 002f3c28: am 4636abe5: Merge "Real "LOCAL_MULTILIB := both" for prebuilts"

* commit 'e75315fdef200600f280f829089fd8d32e662b2e':
  Real "LOCAL_MULTILIB := both" for prebuilts

10 years agoam 002f3c28: am 4636abe5: Merge "Real "LOCAL_MULTILIB := both" for prebuilts"
Ying Wang [Sat, 17 May 2014 03:08:26 +0000 (03:08 +0000)]
am 002f3c28: am 4636abe5: Merge "Real "LOCAL_MULTILIB := both" for prebuilts"

* commit '002f3c28629b8ee84d0a54fe9f2de745e965b9dc':
  Real "LOCAL_MULTILIB := both" for prebuilts

10 years agoam 4636abe5: Merge "Real "LOCAL_MULTILIB := both" for prebuilts"
Ying Wang [Sat, 17 May 2014 03:06:42 +0000 (03:06 +0000)]
am 4636abe5: Merge "Real "LOCAL_MULTILIB := both" for prebuilts"

* commit '4636abe5899272e1e9051e2c98516409107c4e8c':
  Real "LOCAL_MULTILIB := both" for prebuilts

10 years agoMerge "Real "LOCAL_MULTILIB := both" for prebuilts"
Ying Wang [Sat, 17 May 2014 03:03:43 +0000 (03:03 +0000)]
Merge "Real "LOCAL_MULTILIB := both" for prebuilts"

10 years agoFix salt for verity tree generation.
Geremy Condra [Sat, 17 May 2014 02:14:30 +0000 (19:14 -0700)]
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

10 years agoam 5989a051: am 023209b6: am 5ee3f096: Merge "Default TARGET_CPU_SMP to true."
Ying Wang [Sat, 17 May 2014 00:16:07 +0000 (00:16 +0000)]
am 5989a051: am 023209b6: am 5ee3f096: Merge "Default TARGET_CPU_SMP to true."

* commit '5989a05130ff3cd4a789afb2fd09e9f03a58bc3c':
  Default TARGET_CPU_SMP to true.

10 years agoam 023209b6: am 5ee3f096: Merge "Default TARGET_CPU_SMP to true."
Ying Wang [Sat, 17 May 2014 00:12:50 +0000 (00:12 +0000)]
am 023209b6: am 5ee3f096: Merge "Default TARGET_CPU_SMP to true."

* commit '023209b63ee4be4289b3e07b3c3dc54773523094':
  Default TARGET_CPU_SMP to true.

10 years agoam 5ee3f096: Merge "Default TARGET_CPU_SMP to true."
Ying Wang [Sat, 17 May 2014 00:09:03 +0000 (00:09 +0000)]
am 5ee3f096: Merge "Default TARGET_CPU_SMP to true."

* commit '5ee3f0960dbc6a14333e3b98252d59f5d8d18a7d':
  Default TARGET_CPU_SMP to true.

10 years agoMerge "Default TARGET_CPU_SMP to true."
Ying Wang [Sat, 17 May 2014 00:07:15 +0000 (00:07 +0000)]
Merge "Default TARGET_CPU_SMP to true."

10 years agoam fb71a59e: am 11278626: am 3c8089ce: Merge "Fix the missing 2nd arch prefix."
Ying Wang [Fri, 16 May 2014 23:33:45 +0000 (23:33 +0000)]
am fb71a59e: am 11278626: am 3c8089ce: Merge "Fix the missing 2nd arch prefix."

* commit 'fb71a59ef79d22c1acaf4a57980bc932886821cb':
  Fix the missing 2nd arch prefix.

10 years agoam 11278626: am 3c8089ce: Merge "Fix the missing 2nd arch prefix."
Ying Wang [Fri, 16 May 2014 23:30:15 +0000 (23:30 +0000)]
am 11278626: am 3c8089ce: Merge "Fix the missing 2nd arch prefix."

* commit '112786266ab4737d7e586b2a14084d3d2e3974e3':
  Fix the missing 2nd arch prefix.

10 years agoDefault TARGET_CPU_SMP to true.
Ying Wang [Fri, 16 May 2014 23:27:11 +0000 (16:27 -0700)]
Default TARGET_CPU_SMP to true.

Change-Id: If8c52c8ed66d52452967d09885dfe1ca9da13688

10 years agoam 3c8089ce: Merge "Fix the missing 2nd arch prefix."
Ying Wang [Fri, 16 May 2014 23:26:31 +0000 (23:26 +0000)]
am 3c8089ce: Merge "Fix the missing 2nd arch prefix."

* commit '3c8089cef8eaf90b11852a5c258eba0ff5e3287e':
  Fix the missing 2nd arch prefix.

10 years agoMerge "Fix the missing 2nd arch prefix."
Ying Wang [Fri, 16 May 2014 23:23:16 +0000 (23:23 +0000)]
Merge "Fix the missing 2nd arch prefix."

10 years agoFix the missing 2nd arch prefix.
Ying Wang [Fri, 16 May 2014 23:22:32 +0000 (16:22 -0700)]
Fix the missing 2nd arch prefix.

Bug: 13751317
Change-Id: Ie5a323a0a89245576dbc91271d3178574942627d

10 years agoMerge "move telephony, mms, and voip common jars to core_minimal"
Adam Hampson [Fri, 16 May 2014 22:35:32 +0000 (22:35 +0000)]
Merge "move telephony, mms, and voip common jars to core_minimal"

10 years agoam edc2e987: am 304a7a9f: am b589679b: Merge "Use libc++ versions of gtest libs when...
Dan Albert [Fri, 16 May 2014 22:10:07 +0000 (22:10 +0000)]
am edc2e987: am 304a7a9f: am b589679b: Merge "Use libc++ versions of gtest libs when needed"

* commit 'edc2e987df4e921dc5e74ff07f4e406a15aa3ac7':
  Use libc++ versions of gtest libs when needed

10 years agoam 304a7a9f: am b589679b: Merge "Use libc++ versions of gtest libs when needed"
Dan Albert [Fri, 16 May 2014 22:06:03 +0000 (22:06 +0000)]
am 304a7a9f: am b589679b: Merge "Use libc++ versions of gtest libs when needed"

* commit '304a7a9fab6b907801b911ee77542296884c9d91':
  Use libc++ versions of gtest libs when needed

10 years agoam b589679b: Merge "Use libc++ versions of gtest libs when needed"
Dan Albert [Fri, 16 May 2014 22:03:56 +0000 (22:03 +0000)]
am b589679b: Merge "Use libc++ versions of gtest libs when needed"

* commit 'b589679b101e0863a1fd1d7f4fc6ee3370c8a60a':
  Use libc++ versions of gtest libs when needed

10 years agoam 2f57c850: am 4dd8c970: am a82b32a7: Merge "Use libc++ versions of gtest libs when...
Dan Albert [Fri, 16 May 2014 22:02:57 +0000 (22:02 +0000)]
am 2f57c850: am 4dd8c970: am a82b32a7: Merge "Use libc++ versions of gtest libs when needed"

* commit '2f57c85095c6c2336b964a6965da4093a89e2db3':
  Use libc++ versions of gtest libs when needed

10 years agoMerge "Use libc++ versions of gtest libs when needed"
Dan Albert [Fri, 16 May 2014 22:02:11 +0000 (22:02 +0000)]
Merge "Use libc++ versions of gtest libs when needed"

10 years agoam 4dd8c970: am a82b32a7: Merge "Use libc++ versions of gtest libs when needed"
Dan Albert [Fri, 16 May 2014 21:57:57 +0000 (21:57 +0000)]
am 4dd8c970: am a82b32a7: Merge "Use libc++ versions of gtest libs when needed"

* commit '4dd8c9705db909ba070a830930f1ba72a77192d4':
  Use libc++ versions of gtest libs when needed

10 years agoUse libc++ versions of gtest libs when needed
Dan Albert [Wed, 14 May 2014 21:16:47 +0000 (14:16 -0700)]
Use libc++ versions of gtest libs when needed

Change-Id: Id8752ea946cbaa747dfa4fccf38d680dfeee5b45

10 years agoam a82b32a7: Merge "Use libc++ versions of gtest libs when needed"
Dan Albert [Fri, 16 May 2014 21:54:04 +0000 (21:54 +0000)]
am a82b32a7: Merge "Use libc++ versions of gtest libs when needed"

* commit 'a82b32a7a7855cb93e11e060120803e91cc81c2d':
  Use libc++ versions of gtest libs when needed

10 years agoMerge "Use libc++ versions of gtest libs when needed"
Dan Albert [Fri, 16 May 2014 21:50:27 +0000 (21:50 +0000)]
Merge "Use libc++ versions of gtest libs when needed"

10 years agoam fa1a8333: am 3446af69: Add CalendarProvider to core_tiny
Justin Koh [Fri, 16 May 2014 21:10:39 +0000 (21:10 +0000)]
am fa1a8333: am 3446af69: Add CalendarProvider to core_tiny

* commit 'fa1a8333afa51ebb00c5509defc480f61ba638cb':
  Add CalendarProvider to core_tiny

10 years agoam 3446af69: Add CalendarProvider to core_tiny
Justin Koh [Fri, 16 May 2014 20:48:34 +0000 (20:48 +0000)]
am 3446af69: Add CalendarProvider to core_tiny

* commit '3446af6977e43adde2cca643c2105a94c6fad275':
  Add CalendarProvider to core_tiny

10 years agoam 9e55ed53: am 47316a27: am 5137d458: Merge "Force to build llvm from source in...
Ying Wang [Fri, 16 May 2014 19:05:40 +0000 (19:05 +0000)]
am 9e55ed53: am 47316a27: am 5137d458: Merge "Force to build llvm from source in 64-bit host build."

* commit '9e55ed53ef7dfebc759a2494503b19e33b0c47d7':
  Force to build llvm from source in 64-bit host build.

10 years agoam 47316a27: am 5137d458: Merge "Force to build llvm from source in 64-bit host build."
Ying Wang [Fri, 16 May 2014 19:02:52 +0000 (19:02 +0000)]
am 47316a27: am 5137d458: Merge "Force to build llvm from source in 64-bit host build."

* commit '47316a27eac94c45e47a26cb52cc5b03753dd24e':
  Force to build llvm from source in 64-bit host build.

10 years agoam 5137d458: Merge "Force to build llvm from source in 64-bit host build."
Ying Wang [Fri, 16 May 2014 18:59:23 +0000 (18:59 +0000)]
am 5137d458: Merge "Force to build llvm from source in 64-bit host build."

* commit '5137d4584e60dea68715dbcae5e276b3af965460':
  Force to build llvm from source in 64-bit host build.

10 years agoMerge "Force to build llvm from source in 64-bit host build."
Ying Wang [Fri, 16 May 2014 18:55:48 +0000 (18:55 +0000)]
Merge "Force to build llvm from source in 64-bit host build."

10 years agoAdd CalendarProvider to core_tiny
Justin Koh [Fri, 16 May 2014 18:29:11 +0000 (11:29 -0700)]
Add CalendarProvider to core_tiny

This is required for CTS.
Bug: 15003038

Change-Id: I9ac43f4875e979b086c88859a09626254f3ad06a

10 years agoUse libc++ versions of gtest libs when needed
Dan Albert [Wed, 14 May 2014 21:16:47 +0000 (14:16 -0700)]
Use libc++ versions of gtest libs when needed

Change-Id: I19aa58a83a9da680d441af5f3956a2fbdf18c4e4

10 years agoReal "LOCAL_MULTILIB := both" for prebuilts
Ying Wang [Fri, 16 May 2014 17:38:43 +0000 (10:38 -0700)]
Real "LOCAL_MULTILIB := both" for prebuilts

This uses the fact that unsetting LOCAL_MULTILIB equals "either".
It's useful to build for both 32-bit and 64-bit in the same prebuilt
module definition.

Bug: 13751317
Change-Id: I4f1625a83e13f22f807039afebae73f69ed35918

10 years agoam 994a8db5: am c7933482: am c0f10644: Merge "make SignApk do zip alignment"
Doug Zongker [Fri, 16 May 2014 17:40:54 +0000 (17:40 +0000)]
am 994a8db5: am c7933482: am c0f10644: Merge "make SignApk do zip alignment"

* commit '994a8db5a990676f1b08dab2ee980a9fc8d63685':
  make SignApk do zip alignment