Geremy Condra
d75d7128ce
Merge "Add support for block incremental OTAs"
2014-02-20 21:10:39 +00:00
Geremy Condra
36bd365625
Add support for block incremental OTAs
...
Change-Id: Ie72015e34ed8d7595a5c74c8df41cba73275afab
2014-02-20 12:54:17 -08:00
Steve Moyer
ffe0beeb1b
Merge "Combine emulator test projects into a single apk"
2014-02-20 18:33:06 +00:00
Doug Zongker
e322058542
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
2014-02-20 08:47:29 -08:00
Doug Zongker
4abfeaa358
Merge "rebuild recovery patch in sign_target_files_apks"
2014-02-20 16:33:36 +00:00
Steve Moyer
6bbb6a1fe3
Combine emulator test projects into a single apk
...
SmsTest, GpsLocationTest, ConnectivityTest -> EmulatorSmokeTests
Change-Id: I39e02fbe2cf9761607dfb4c2f0d6c4906e8b1e51
2014-02-19 10:39:20 -08:00
Ying Wang
3c5f698cea
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
2014-02-19 18:34:48 +00:00
Ying Wang
315522ec29
am 32e93384: am 3d9c1c1a: Merge "Switch x86_64 to gcc-4.8"
...
* commit '32e93384b73746c54f8bc0e8a7b818acc5c1b00e':
Switch x86_64 to gcc-4.8
2014-02-19 18:31:16 +00:00
Ying Wang
21ec64b169
am 5aa50c66: Merge "Fix x86 config file to support 2nd ARCH build"
...
* commit '5aa50c6637f88213661b29facaf05f072316dec0':
Fix x86 config file to support 2nd ARCH build
2014-02-19 18:26:36 +00:00
Ying Wang
32e93384b7
am 3d9c1c1a: Merge "Switch x86_64 to gcc-4.8"
...
* commit '3d9c1c1a537ead6071165ea661507e0a9250dc4a':
Switch x86_64 to gcc-4.8
2014-02-19 18:23:10 +00:00
Ying Wang
5aa50c6637
Merge "Fix x86 config file to support 2nd ARCH build"
2014-02-19 18:19:22 +00:00
Ying Wang
3d9c1c1a53
Merge "Switch x86_64 to gcc-4.8"
2014-02-19 18:17:52 +00:00
Colin Cross
eb6a43654e
am c798836a: am 4febec12: Merge "x86: set -msse2 for all builds"
...
* commit 'c798836a82584744a02a26c57f2733fcb0b0e0cf':
x86: set -msse2 for all builds
2014-02-19 01:12:40 +00:00
Colin Cross
c798836a82
am 4febec12: Merge "x86: set -msse2 for all builds"
...
* commit '4febec12272a90456c5216cc10ccc059ba11552d':
x86: set -msse2 for all builds
2014-02-19 01:06:26 +00:00
Colin Cross
4febec1227
Merge "x86: set -msse2 for all builds"
2014-02-19 01:00:33 +00:00
Colin Cross
4aa263f2be
x86: set -msse2 for all builds
...
All supported x86 processors have SSE2.
Change-Id: Ib4a0511c456fe3185b0b902390860ad557aeedcf
2014-02-18 15:49:48 -08:00
Stephen Hines
a0d13d81d6
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.
2014-02-18 23:18:06 +00:00
Stephen Hines
515f379f1d
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.
2014-02-18 23:12:37 +00:00
Stephen Hines
f1ad4d2d2e
Merge "Add bcc to the list of PRODUCT_PACKAGES to install."
2014-02-18 23:05:42 +00:00
Ying Wang
8918bf6f2f
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.
2014-02-18 23:00:02 +00:00
Ying Wang
f133940642
am 0c0a4ce8: Remove the default sdk.atree if custom one is set.
...
* commit '0c0a4ce8f4c40b47d34774c7f36c80ae7f8082fc':
Remove the default sdk.atree if custom one is set.
2014-02-18 22:54:08 +00:00
Ying Wang
0c0a4ce8f4
Remove the default sdk.atree if custom one is set.
...
Change-Id: I5d20b030db5ef29d7ff6eb64a0a1e11a4283e85d
2014-02-18 14:33:25 -08:00
Stephen Hines
816b86f759
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
2014-02-18 14:21:39 -08:00
Doug Zongker
211213f561
Merge "bump releasetools python requirement to 2.7"
2014-02-18 19:29:40 +00:00
Ying Wang
6d5ca9f46b
am 52cefc36: resolved conflicts for merge of 6ca56b6a
to klp-modular-dev-plus-aosp
...
* commit '52cefc36cf4718cd85e6e35832b2a8674ba9e838':
Make the module existence check nonfatal
2014-02-18 19:24:39 +00:00
Ying Wang
52cefc36cf
resolved conflicts for merge of 6ca56b6a
to klp-modular-dev-plus-aosp
...
Change-Id: I8f647bb5ff9a4de1fbdbfb1dae169e547aeba3ce
2014-02-18 11:17:53 -08:00
Ying Wang
6ca56b6ae7
Merge "Make the module existence check nonfatal" into klp-modular-dev
2014-02-18 19:11:50 +00:00
Doug Zongker
cf6d5a9074
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
2014-02-18 10:57:07 -08:00
Pavel Chupin
c562742e0b
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>
2014-02-18 17:02:36 +04:00
Narayan Kamath
0158f8f71c
am 0003192c: am 2bea94ba: Merge "Fix up android.core CTS tests."
...
* commit '0003192c32ff9672a3974709912acc853053c7a8':
Fix up android.core CTS tests.
2014-02-17 13:10:32 +00:00
Narayan Kamath
21f1d95870
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.
2014-02-17 13:10:31 +00:00
Narayan Kamath
7ad6f5f76b
am 35513f4c: (-s ours) am d4dc88b0: Merge "Adding apache-harmony to cts."
...
* commit '35513f4c92707745025e039187b0b91783a39af3':
Adding apache-harmony to cts.
2014-02-17 13:05:03 +00:00
Narayan Kamath
129be82091
am 6b835426: (-s ours) am 92e99b12: Merge "add jsr166 tests to cts. Bug: 10390711"
...
* commit '6b83542627e28c09b08c0cf131fc9f0f3c30627f':
add jsr166 tests to cts. Bug: 10390711
2014-02-17 12:59:35 +00:00
Narayan Kamath
0003192c32
am 2bea94ba: Merge "Fix up android.core CTS tests."
...
* commit '2bea94bac78d8a8ed5030d1e09d48db677e1167d':
Fix up android.core CTS tests.
2014-02-17 12:31:00 +00:00
Narayan Kamath
2a1a308f3b
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.
2014-02-17 12:30:59 +00:00
Narayan Kamath
35513f4c92
am d4dc88b0: Merge "Adding apache-harmony to cts."
...
* commit 'd4dc88b0f5be3670187f2fe3bb659aaeec032d3a':
Adding apache-harmony to cts.
2014-02-17 12:30:58 +00:00
Narayan Kamath
6b83542627
am 92e99b12: Merge "add jsr166 tests to cts. Bug: 10390711"
...
* commit '92e99b128d170b28972ac3910090734e803c93e5':
add jsr166 tests to cts. Bug: 10390711
2014-02-17 12:30:58 +00:00
Narayan Kamath
2bea94bac7
Merge "Fix up android.core CTS tests."
2014-02-17 12:25:26 +00:00
Narayan Kamath
70a4a6a332
Merge "changing the rules following java package renaming for external/apache-harmony."
2014-02-17 12:25:24 +00:00
Narayan Kamath
d4dc88b0f5
Merge "Adding apache-harmony to cts."
2014-02-17 12:25:21 +00:00
Narayan Kamath
92e99b128d
Merge "add jsr166 tests to cts. Bug: 10390711"
2014-02-17 12:25:19 +00:00
Narayan Kamath
ba0b0e71ae
Fix up android.core CTS tests.
...
Fix several wrongly configured tests that were either
looking for tests in the wrong jar (apache-harmony-tests
instead of core-tests) or using the wrong prefix.
Also, this change creates subsets of the harmony tests based
on subpackage names (java.net, java.io, java.nio etc.) instead
of the earlier harmony groupings.
Change-Id: Iea0e20d23512611d1aac92b2f8219031b6396c77
2014-02-17 12:09:24 +00:00
Tsu Chiang Chuang
7d42d0f251
changing the rules following java package renaming for
...
external/apache-harmony.
(cherry picked from commit 27b4b5ffe12b179fc0d24747f9ead2d5f52c871a)
Change-Id: Ia5a7b2d401f23dfdc556ef1982efd441ed1d1ae2
2014-02-17 12:09:13 +00:00
Tsu Chiang Chuang
9c648df491
Adding apache-harmony to cts.
...
(cherry-picked from commit 5fef52e9c986184796ff1e5fe54390614ba318a6)
Change-Id: I9a6595f5e8bc30654a062e0917d3ecd3ba28ebc7
2014-02-17 12:08:59 +00:00
Tsu Chiang Chuang
4e189b08f3
add jsr166 tests to cts.
...
Bug: 10390711
Change-Id: I512770e98f61995fc33043d35562dc3b213a4930
2014-02-17 12:08:39 +00:00
Qiming Shi
310324d28a
Fix x86 config file to support 2nd ARCH build
...
Change-Id: I5f6091c555b9e742303f294b7c07a981ae5c6026
Signed-off-by: Qiming Shi <qiming.shi@intel.com>
2014-02-17 17:46:48 +08:00
Dirk Dougherty
5f977bb9e1
am bdaf9012: am 98756f3b: am 8a56079c: am 5c92d966: am 541b4941: New temporary templates set for dynamic content support.
...
* commit 'bdaf90122ae93469175304be6bee4ad0f0375639':
New temporary templates set for dynamic content support.
2014-02-15 18:25:38 +00:00
Dirk Dougherty
bdaf90122a
am 98756f3b: am 8a56079c: am 5c92d966: am 541b4941: New temporary templates set for dynamic content support.
...
* commit '98756f3b7e16558ae4e17891237163ab8a23c462':
New temporary templates set for dynamic content support.
2014-02-15 18:20:12 +00:00
Dirk Dougherty
98756f3b7e
am 8a56079c: am 5c92d966: am 541b4941: New temporary templates set for dynamic content support.
...
* commit '8a56079c74765afa405a96bd025f2bddac4e17b6':
New temporary templates set for dynamic content support.
2014-02-15 18:16:51 +00:00
Dirk Dougherty
8a56079c74
am 5c92d966: am 541b4941: New temporary templates set for dynamic content support.
...
* commit '5c92d966076b28024a9efd6c8456445e207748f1':
New temporary templates set for dynamic content support.
2014-02-15 18:14:37 +00:00