git.osdn.net Git - android-x86/build.git/log

Elliott Hughes [Wed, 26 Feb 2014 02:15:54 +0000 (02:15 +0000)]

am 1615a101: am 4a122c96: am 9dba192b: Merge "oprofile/daemon doesn\'t build for x86_64."

* commit '1615a1013e311ca19e999ab7ff2c81ea9d9f4a69':
oprofile/daemon doesn't build for x86_64.

commit | commitdiff | tree

Elliott Hughes [Wed, 26 Feb 2014 02:12:52 +0000 (02:12 +0000)]

am 4a122c96: am 9dba192b: Merge "oprofile/daemon doesn\'t build for x86_64."

* commit '4a122c96f3abf0eb20c5b2c3db7cd067f5a919fb':
oprofile/daemon doesn't build for x86_64.

commit | commitdiff | tree

Elliott Hughes [Wed, 26 Feb 2014 02:07:18 +0000 (02:07 +0000)]

am 9dba192b: Merge "oprofile/daemon doesn\'t build for x86_64."

* commit '9dba192b76ee75c578a62dcef0160fc719a57914':
oprofile/daemon doesn't build for x86_64.

commit | commitdiff | tree

Elliott Hughes [Wed, 26 Feb 2014 02:02:30 +0000 (02:02 +0000)]

Merge "oprofile/daemon doesn't build for x86_64."

am 08842ae7: am 12c909b2: resolved conflicts for merge of 9057f619 to klp-modular-dev-plus-aosp

* commit '08842ae767b03776224baa7164a1d7f294e5b166':
Remove external/wpa_supplicant_8 and external/android-clat

am 12c909b2: resolved conflicts for merge of 9057f619 to klp-modular-dev-plus-aosp

* commit '12c909b20c2a1f8be74914186e54c4143ddc263e':
Remove external/wpa_supplicant_8 and external/android-clat

resolved conflicts for merge of 9057f619 to klp-modular-dev-plus-aosp

Change-Id: Ie8b363ede2a062a34962f9111b79df1ebc674c9e

commit | commitdiff | tree

Elliott Hughes [Wed, 26 Feb 2014 01:32:22 +0000 (17:32 -0800)]

oprofile/daemon doesn't build for x86_64.

We'll probably remove external/oprofile soon, but this gets us closer
to being able to turn on an x86_64 continuous build in the meantime.

Change-Id: Ic1d5331d41dafee9ffed222dc332afed2d4ae356

Merge "Remove external/wpa_supplicant_8 and external/android-clat"

Remove external/wpa_supplicant_8 and external/android-clat

from 64_bit_blacklist.mk.
They now build fine for 64-bit.

Change-Id: Ib73c8465b72cc7b40dae21441c3ea0bd25b7e6ba

commit | commitdiff | tree

Elliott Hughes [Wed, 26 Feb 2014 00:29:52 +0000 (00:29 +0000)]

am 9f3e1d78: am 331272f9: am 25b55485: Merge "Take libcore off the LP64 blacklist."

* commit '9f3e1d788e32212cdac8e8c955c28d773bfe062b':
Take libcore off the LP64 blacklist.

commit | commitdiff | tree

Elliott Hughes [Wed, 26 Feb 2014 00:26:37 +0000 (00:26 +0000)]

am 331272f9: am 25b55485: Merge "Take libcore off the LP64 blacklist."

* commit '331272f94bc85c5eb9853e726c024375f691ab59':
Take libcore off the LP64 blacklist.

am 31dab4c4: am 4a0b06e8: am f1ff3abd: Merge "Generate .pb.cc/.pb.h to arch-neutral generated_sources_dir"

* commit '31dab4c45fc3457a4537f3cbceca572faa9a85ca':
Generate .pb.cc/.pb.h to arch-neutral generated_sources_dir

commit | commitdiff | tree

Elliott Hughes [Wed, 26 Feb 2014 00:22:49 +0000 (00:22 +0000)]

am 25b55485: Merge "Take libcore off the LP64 blacklist."

* commit '25b5548522220940f50ab5b4dfb3e2e691ad913b':
Take libcore off the LP64 blacklist.

am 4a0b06e8: am f1ff3abd: Merge "Generate .pb.cc/.pb.h to arch-neutral generated_sources_dir"

* commit '4a0b06e80871aad1bc8a8493bdd74b9ff30a9a2f':
Generate .pb.cc/.pb.h to arch-neutral generated_sources_dir

am f1ff3abd: Merge "Generate .pb.cc/.pb.h to arch-neutral generated_sources_dir"

* commit 'f1ff3abd83cbc9884082c09bb9b1d4a5080134c1':
Generate .pb.cc/.pb.h to arch-neutral generated_sources_dir

commit | commitdiff | tree

Elliott Hughes [Wed, 26 Feb 2014 00:18:04 +0000 (00:18 +0000)]

Merge "Take libcore off the LP64 blacklist."

Merge "Generate .pb.cc/.pb.h to arch-neutral generated_sources_dir"

Generate .pb.cc/.pb.h to arch-neutral generated_sources_dir

So a library can export the proto's include path that can be used with
both archs in multilib build.

Change-Id: Ia0f92f0b40e39dc3fa426c69c52139a0a8f04077

commit | commitdiff | tree

Elliott Hughes [Tue, 25 Feb 2014 23:54:26 +0000 (15:54 -0800)]

Take libcore off the LP64 blacklist.

Change-Id: I34bc49370ecdd37f83927c3829c775e404bcbd73

commit | commitdiff | tree

Nick Kralevich [Tue, 25 Feb 2014 22:07:14 +0000 (22:07 +0000)]

am 61b71bb2: am b8d792d7: am e7154870: Merge "Move qemud and /dev/qemu policy bits to emulator-specific sepolicy."

* commit '61b71bb211dc6c1d9cb85a25232d8b0234bfe13c':
Move qemud and /dev/qemu policy bits to emulator-specific sepolicy.

commit | commitdiff | tree

Nick Kralevich [Tue, 25 Feb 2014 22:03:59 +0000 (22:03 +0000)]

am b8d792d7: am e7154870: Merge "Move qemud and /dev/qemu policy bits to emulator-specific sepolicy."

* commit 'b8d792d734a1470aa96062fe284a5d288e7bbc30':
Move qemud and /dev/qemu policy bits to emulator-specific sepolicy.

commit | commitdiff | tree

Nick Kralevich [Tue, 25 Feb 2014 21:58:45 +0000 (21:58 +0000)]

am e7154870: Merge "Move qemud and /dev/qemu policy bits to emulator-specific sepolicy."

* commit 'e715487031036ecc75bfedb94b2d6c9dbd3bc98d':
Move qemud and /dev/qemu policy bits to emulator-specific sepolicy.

commit | commitdiff | tree

Nick Kralevich [Tue, 25 Feb 2014 21:54:39 +0000 (21:54 +0000)]

Merge "Move qemud and /dev/qemu policy bits to emulator-specific sepolicy."

am ead8944e: Generate .pb.cc/.pb.h to arch-neutral generated_sources_dir

* commit 'ead8944e8da9a4b6dbe344b8d93b2c6b2a730f68':
Generate .pb.cc/.pb.h to arch-neutral generated_sources_dir

commit | commitdiff | tree

Stephen Smalley [Tue, 25 Feb 2014 18:37:06 +0000 (13:37 -0500)]

Move qemud and /dev/qemu policy bits to emulator-specific sepolicy.

Change-Id: I620d4aef84a5d4565abb1695db54ce1653612bce
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>

commit | commitdiff | tree

Tsu Chiang Chuang [Tue, 25 Feb 2014 18:37:58 +0000 (10:37 -0800)]

add exception to be able to build emulator_tests in conjunction with the
sdk.

Change-Id: Ic4c63c756c78da97657e08faa5b4b6891b951b03

commit | commitdiff | tree

Nicolas Prevot [Tue, 25 Feb 2014 10:04:12 +0000 (10:04 +0000)]

Making ManagedProvisioning present in all phones/tablets.

Change-Id: Icf004835f526e5e6a2798fc5a0003c25d837289d

am 4a2e083f: am 0e0c4879: Merge "generic_x86: toggle 64bit binder ABI"

* commit '4a2e083fa532d94610f07f8a0ae8f32216231266':
generic_x86: toggle 64bit binder ABI

am 0e0c4879: Merge "generic_x86: toggle 64bit binder ABI"

* commit '0e0c48796d9d0ebe415b1ccc9f67ae95f9c716c9':
generic_x86: toggle 64bit binder ABI

Merge "generic_x86: toggle 64bit binder ABI"

am 9b996f80: am eb9b62e0: Merge "Make -rpath-link work with multilib."

* commit '9b996f80a95f48bae153c35bacc0360c004e5258':
Make -rpath-link work with multilib.

am 64fa69d1: am 254a88b9: Merge "Switch to LLVM 3.4 prebuilts in AOSP."

* commit '64fa69d17ed8e67f118873d8ac3394e220b7dbe6':
Switch to LLVM 3.4 prebuilts in AOSP.

am eb9b62e0: Merge "Make -rpath-link work with multilib."

* commit 'eb9b62e08d25ec9067a3f47634a2b8cf750230d8':
Make -rpath-link work with multilib.

am 254a88b9: Merge "Switch to LLVM 3.4 prebuilts in AOSP."

* commit '254a88b9578883f3138be6991c7bcdb8393af188':
Switch to LLVM 3.4 prebuilts in AOSP.

Merge "Make -rpath-link work with multilib."

Make -rpath-link work with multilib.

Change-Id: If69ea6ed6cdbb657ed4005f8217d653e29626783

Merge "Switch to LLVM 3.4 prebuilts in AOSP."

commit | commitdiff | tree

Colin Cross [Fri, 21 Feb 2014 13:54:00 +0000 (13:54 +0000)]

am 6da37a0f: am b3bc6136: Merge "arm64: don\'t build emulator"

* commit '6da37a0fd37ebc8d79b9119a13f80207d5560aaf':
arm64: don't build emulator

am 0c9c0bfc: am 9aadde67: Merge "Include in upper-level makefiles"

* commit '0c9c0bfcc6f2d10fa7235f48b0174a1a120ca599':
Include $(BUILD_COPY_HEADERS) in upper-level makefiles

am e9bb9870: am 9335001d: Merge "Strip all symbols on x86"

* commit 'e9bb9870027429b56e42604802b07c1c3d7a8a4e':
Strip all symbols on x86

am fab0fe3b: am e72beb53: Merge "Remove dead code."

* commit 'fab0fe3b647f364a61c84f4048d36b1d68a51226':
Remove dead code.

commit | commitdiff | tree

Colin Cross [Thu, 20 Feb 2014 22:55:24 +0000 (22:55 +0000)]

am b3bc6136: Merge "arm64: don\'t build emulator"

* commit 'b3bc61365bb71cc45d10c22762aa86a3b78f1329':
arm64: don't build emulator

commit | commitdiff | tree

Mark Salyzyn [Thu, 20 Feb 2014 22:50:03 +0000 (22:50 +0000)]

Merge "build: add logd"

commit | commitdiff | tree

Colin Cross [Thu, 20 Feb 2014 22:49:32 +0000 (22:49 +0000)]

Merge "arm64: don't build emulator"

commit | commitdiff | tree

Colin Cross [Thu, 20 Feb 2014 22:39:09 +0000 (14:39 -0800)]

arm64: don't build emulator

There is no emulator kernel yet, so don't try to build the emulator.

Change-Id: I714f5717f439b4e48a973f4355f2c6684af79764

am 9aadde67: Merge "Include in upper-level makefiles"

* commit '9aadde673481043f650a420a104dde21a4c13f57':
Include $(BUILD_COPY_HEADERS) in upper-level makefiles

Merge "Include $(BUILD_COPY_HEADERS) in upper-level makefiles"

Include $(BUILD_COPY_HEADERS) in upper-level makefiles

This makes sure copy_headers.mk only be included onces, no matter
it's for the 1st arch or the 2nd arch.

Change-Id: I80a558fbdb52861f176bd27a21c302069a5cc3ce

commit | commitdiff | tree

Doug Zongker [Thu, 20 Feb 2014 21:34:10 +0000 (21:34 +0000)]

Merge "add --block flag to ota_from_target_files"

commit | commitdiff | tree

Doug Zongker [Thu, 20 Feb 2014 21:22:07 +0000 (13:22 -0800)]

add --block flag to ota_from_target_files

Add the --block flag to this script to control whether block-based OTA
packages are generated (defaults to off). Make the full OTA package
produced by "make otapackage" continue to produce a block-based OTA.

Also fix a problem where block incremental OTAs didn't ever succeed,
and the --no_signing option never worked.

Change-Id: I610d0b4abed4b8b65fbe8ce0abaeec6cf52e14a1

am a5e79db0: am f9538ea6: Merge "Add missing s to mips."

* commit 'a5e79db0791340e0b6837903c234c3f97d4c5332':
Add missing $(combo_2nd_arch_prefix)s to mips.

commit | commitdiff | tree

Geremy Condra [Thu, 20 Feb 2014 21:10:38 +0000 (21:10 +0000)]

Merge "Add support for block incremental OTAs"

commit | commitdiff | tree

Geremy Condra [Fri, 7 Feb 2014 03:45:10 +0000 (19:45 -0800)]

Add support for block incremental OTAs

Change-Id: Ie72015e34ed8d7595a5c74c8df41cba73275afab

am 9335001d: Merge "Strip all symbols on x86"

* commit '9335001d5d15777522455d5f593a9a69719b12b7':
Strip all symbols on x86

am e72beb53: Merge "Remove dead code."

* commit 'e72beb53a8f0644d65c3e218677e287c109d67c6':
Remove dead code.

commit | commitdiff | tree

Steve Moyer [Thu, 20 Feb 2014 18:33:05 +0000 (18:33 +0000)]

Merge "Combine emulator test projects into a single apk"

Merge "Strip all symbols on x86"

Merge "Remove dead code."

commit | commitdiff | tree

Doug Zongker [Thu, 20 Feb 2014 16:47:29 +0000 (08:47 -0800)]

img_from_target_files doesn't need releasetools extensions

This argument is superfluous; we don't need to compute its value or
pass it to the script.

Change-Id: I567a5c0b67060f8fcc0bf83e5bfa0272312b9124

commit | commitdiff | tree

Doug Zongker [Thu, 20 Feb 2014 16:33:35 +0000 (16:33 +0000)]

Merge "rebuild recovery patch in sign_target_files_apks"

am f9538ea6: Merge "Add missing s to mips."

* commit 'f9538ea6261f373bdb993bc5d0a503b4ecbc0c22':
Add missing $(combo_2nd_arch_prefix)s to mips.

Merge "Add missing $(combo_2nd_arch_prefix)s to mips."

commit | commitdiff | tree

Elliott Hughes [Thu, 20 Feb 2014 02:47:50 +0000 (18:47 -0800)]

Add missing $(combo_2nd_arch_prefix)s to mips.

Change-Id: I91a5f2d92cc964cbaeb1c07f27eb56ea1a0d53cc

Remove dead code.

It seems the code was meant to add the toolchain to ANDROID_BUILD_PATHS
and then export to PATH by lunch.
But now we export the toolchain to PATH explicitly in envsetup.sh and
the code is unnecessary.
This reduces the places to change when we upgrade the gcc version.
It also fixed the bug that the mips toolchain was always exported
regardless of the target arch.

Change-Id: Iee3b895b4c4e0df8971c27c01b9ecbd591848b12

commit | commitdiff | tree

C. Sean Young [Wed, 19 Feb 2014 20:53:43 +0000 (12:53 -0800)]

Strip all symbols on x86

Strip all of the non-dynamic symbols on x86 targets,
instead of just the debug symbols.

Change-Id: Id799a6a8c8b0e8bf70977328e42e5efa23762f25

commit | commitdiff | tree

Steve Moyer [Wed, 19 Feb 2014 01:46:19 +0000 (17:46 -0800)]

Combine emulator test projects into a single apk

SmsTest, GpsLocationTest, ConnectivityTest -> EmulatorSmokeTests

Change-Id: I39e02fbe2cf9761607dfb4c2f0d6c4906e8b1e51

am 21ec64b1: am 5aa50c66: Merge "Fix x86 config file to support 2nd ARCH build"

* commit '21ec64b16914dfd05e07558b00ada867b7aa8b6e':
Fix x86 config file to support 2nd ARCH build

am 32e93384: am 3d9c1c1a: Merge "Switch x86_64 to gcc-4.8"

* commit '32e93384b73746c54f8bc0e8a7b818acc5c1b00e':
Switch x86_64 to gcc-4.8

am 5aa50c66: Merge "Fix x86 config file to support 2nd ARCH build"

* commit '5aa50c6637f88213661b29facaf05f072316dec0':
Fix x86 config file to support 2nd ARCH build

am 3d9c1c1a: Merge "Switch x86_64 to gcc-4.8"

* commit '3d9c1c1a537ead6071165ea661507e0a9250dc4a':
Switch x86_64 to gcc-4.8

Merge "Fix x86 config file to support 2nd ARCH build"

Merge "Switch x86_64 to gcc-4.8"

commit | commitdiff | tree

Stephen Hines [Wed, 19 Feb 2014 17:03:00 +0000 (09:03 -0800)]

Switch to LLVM 3.4 prebuilts in AOSP.

Change-Id: I064e953fb1bf69e7e321616647aab88dcc39af76

commit | commitdiff | tree

Colin Cross [Wed, 19 Feb 2014 01:12:40 +0000 (01:12 +0000)]

am c798836a: am 4febec12: Merge "x86: set -msse2 for all builds"

* commit 'c798836a82584744a02a26c57f2733fcb0b0e0cf':
x86: set -msse2 for all builds

commit | commitdiff | tree

Colin Cross [Wed, 19 Feb 2014 01:06:26 +0000 (01:06 +0000)]

am 4febec12: Merge "x86: set -msse2 for all builds"

* commit '4febec12272a90456c5216cc10ccc059ba11552d':
x86: set -msse2 for all builds

commit | commitdiff | tree

Colin Cross [Wed, 19 Feb 2014 01:00:33 +0000 (01:00 +0000)]

Merge "x86: set -msse2 for all builds"

commit | commitdiff | tree

Colin Cross [Tue, 18 Feb 2014 23:49:48 +0000 (15:49 -0800)]

x86: set -msse2 for all builds

All supported x86 processors have SSE2.

Change-Id: Ib4a0511c456fe3185b0b902390860ad557aeedcf

commit | commitdiff | tree

Stephen Hines [Tue, 18 Feb 2014 23:18:06 +0000 (23:18 +0000)]

am 515f379f: am f1ad4d2d: Merge "Add bcc to the list of PRODUCT_PACKAGES to install."

* commit '515f379f1dd14e7564ad99dec42549a263863166':
Add bcc to the list of PRODUCT_PACKAGES to install.

commit | commitdiff | tree

Stephen Hines [Tue, 18 Feb 2014 23:12:37 +0000 (23:12 +0000)]

am f1ad4d2d: Merge "Add bcc to the list of PRODUCT_PACKAGES to install."

* commit 'f1ad4d2d2eea9952963fd52fa56e9ab16b108618':
Add bcc to the list of PRODUCT_PACKAGES to install.

commit | commitdiff | tree

Stephen Hines [Tue, 18 Feb 2014 23:05:42 +0000 (23:05 +0000)]

Merge "Add bcc to the list of PRODUCT_PACKAGES to install."

am f1339406: am 0c0a4ce8: Remove the default sdk.atree if custom one is set.

* commit 'f133940642722c45a37aad718423f3dac58233c0':
Remove the default sdk.atree if custom one is set.

am 0c0a4ce8: Remove the default sdk.atree if custom one is set.

* commit '0c0a4ce8f4c40b47d34774c7f36c80ae7f8082fc':
Remove the default sdk.atree if custom one is set.

Remove the default sdk.atree if custom one is set.

Change-Id: I5d20b030db5ef29d7ff6eb64a0a1e11a4283e85d

commit | commitdiff | tree

Stephen Hines [Thu, 23 Jan 2014 03:50:43 +0000 (19:50 -0800)]

Add bcc to the list of PRODUCT_PACKAGES to install.

Bug: 7342767

As part of the process of sandboxing the online RenderScript compiler, we
need to install bcc.

Change-Id: Ia650bdcb760246f3f1e15ebb867f07d9802cdfbe

commit | commitdiff | tree

Doug Zongker [Tue, 18 Feb 2014 19:29:40 +0000 (19:29 +0000)]

Merge "bump releasetools python requirement to 2.7"

am 52cefc36: resolved conflicts for merge of 6ca56b6a to klp-modular-dev-plus-aosp

* commit '52cefc36cf4718cd85e6e35832b2a8674ba9e838':
Make the module existence check nonfatal

resolved conflicts for merge of 6ca56b6a to klp-modular-dev-plus-aosp

Change-Id: I8f647bb5ff9a4de1fbdbfb1dae169e547aeba3ce

Merge "Make the module existence check nonfatal" into klp-modular-dev

commit | commitdiff | tree

Doug Zongker [Tue, 18 Feb 2014 18:57:07 +0000 (10:57 -0800)]

bump releasetools python requirement to 2.7

These scripts already use some post-2.4 features, so let's make it
official: Python 2.7 is needed to run them.

Change-Id: I256e9ed99b0b62abe4e22a7b1f811acb7419e88e

commit | commitdiff | tree

Pavel Chupin [Tue, 18 Feb 2014 09:59:07 +0000 (13:59 +0400)]

Switch x86_64 to gcc-4.8

x86 is already on gcc-4.8

Change-Id: I39b4298b705a6ad04cdaa434261c6b0d90d552ff
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>

commit | commitdiff | tree

Narayan Kamath [Mon, 17 Feb 2014 13:10:32 +0000 (13:10 +0000)]

am 0003192c: am 2bea94ba: Merge "Fix up android.core CTS tests."

* commit '0003192c32ff9672a3974709912acc853053c7a8':
Fix up android.core CTS tests.

commit | commitdiff | tree

Narayan Kamath [Mon, 17 Feb 2014 13:10:31 +0000 (13:10 +0000)]

am 2a1a308f: (-s ours) am 70a4a6a3: Merge "changing the rules following java package renaming for external/apache-harmony."

* commit '2a1a308f3bb3f9559461380eb04bfaa0a5554c32':
changing the rules following java package renaming for external/apache-harmony.

commit | commitdiff | tree

Narayan Kamath [Mon, 17 Feb 2014 13:05:03 +0000 (13:05 +0000)]

am 35513f4c: (-s ours) am d4dc88b0: Merge "Adding apache-harmony to cts."

* commit '35513f4c92707745025e039187b0b91783a39af3':
Adding apache-harmony to cts.

commit | commitdiff | tree

Narayan Kamath [Mon, 17 Feb 2014 12:59:35 +0000 (12:59 +0000)]

am 6b835426: (-s ours) am 92e99b12: Merge "add jsr166 tests to cts. Bug: 10390711"

* commit '6b83542627e28c09b08c0cf131fc9f0f3c30627f':
add jsr166 tests to cts. Bug: 10390711

commit | commitdiff | tree

Narayan Kamath [Mon, 17 Feb 2014 12:31:00 +0000 (12:31 +0000)]

am 2bea94ba: Merge "Fix up android.core CTS tests."

* commit '2bea94bac78d8a8ed5030d1e09d48db677e1167d':
Fix up android.core CTS tests.

commit | commitdiff | tree

Narayan Kamath [Mon, 17 Feb 2014 12:30:59 +0000 (12:30 +0000)]

am 70a4a6a3: Merge "changing the rules following java package renaming for external/apache-harmony."

* commit '70a4a6a3323885b0f2701b9a6fe3d2eea2152a23':
changing the rules following java package renaming for external/apache-harmony.

commit | commitdiff | tree

Narayan Kamath [Mon, 17 Feb 2014 12:30:58 +0000 (12:30 +0000)]

am d4dc88b0: Merge "Adding apache-harmony to cts."

* commit 'd4dc88b0f5be3670187f2fe3bb659aaeec032d3a':
Adding apache-harmony to cts.

commit | commitdiff | tree

Narayan Kamath [Mon, 17 Feb 2014 12:30:58 +0000 (12:30 +0000)]

am 92e99b12: Merge "add jsr166 tests to cts. Bug: 10390711"

* commit '92e99b128d170b28972ac3910090734e803c93e5':
add jsr166 tests to cts. Bug: 10390711