OSDN Git Service
Torne (Richard Coles) [Thu, 6 Jun 2013 13:57:42 +0000 (14:57 +0100)]
Add webviewchromium to the preopt jar list.
The default BOOTCLASSPATH now includes webviewchromium.jar, so also add
it to the dex_preopt list.
Change-Id: I67b87cb0bf997c74596c276314a5196f8cf0d1b4
Stephen Hines [Thu, 6 Jun 2013 03:25:40 +0000 (20:25 -0700)]
Remove abcc from build.
Change-Id: I9ca5deea98adbba03081349c16a391a9dd84e347
T.R. Fullhart [Wed, 5 Jun 2013 23:38:11 +0000 (16:38 -0700)]
am
cfe8d122: am
37e1052c: Add support for using custom signapk.jar.
* commit '
cfe8d12213daf8b6de51679ee9686c4042ed944e':
Add support for using custom signapk.jar.
T.R. Fullhart [Wed, 5 Jun 2013 23:36:49 +0000 (16:36 -0700)]
am
37e1052c: Add support for using custom signapk.jar.
* commit '
37e1052c99c1ba045e8d2197637055ceb4b0c308':
Add support for using custom signapk.jar.
T.R. Fullhart [Mon, 18 Mar 2013 17:31:26 +0000 (10:31 -0700)]
Add support for using custom signapk.jar.
Details:
* New --signapk_path, --extra_signapk_args, --java_path.
* New --public_key_suffix, --private_key_suffix so you can change the filenames.
* Fixes raising exceptions on error.
Change-Id: I0b7014b6d779d52ae896f95dfecb1bcccf536cf4
(cherry picked from commit
a28acc6972ce35e9dfab061f175e229859d3e4db)
Clay Murphy [Wed, 5 Jun 2013 21:00:20 +0000 (14:00 -0700)]
am
0b6a52d9: am
49d86864: docs: Adding styles needed by devices/tech/dalvik/dalvik-bytecode.html Bug:
8905394
* commit '
0b6a52d955c23ab40a1585f832a5f68b20078214':
docs: Adding styles needed by devices/tech/dalvik/dalvik-bytecode.html Bug:
8905394
Clay Murphy [Wed, 5 Jun 2013 20:56:56 +0000 (13:56 -0700)]
am
49d86864: docs: Adding styles needed by devices/tech/dalvik/dalvik-bytecode.html Bug:
8905394
* commit '
49d86864881d72a5400f35cd487fedb7b959d4ce':
docs: Adding styles needed by devices/tech/dalvik/dalvik-bytecode.html Bug:
8905394
Clay Murphy [Wed, 5 Jun 2013 18:06:02 +0000 (11:06 -0700)]
docs: Adding styles needed by devices/tech/dalvik/dalvik-bytecode.html
Bug:
8905394
Change-Id: I3a89f9da01d92efd2ea6d9900305ea16a0316d63
T.R. Fullhart [Wed, 5 Jun 2013 17:50:40 +0000 (17:50 +0000)]
Merge "Add support for using custom signapk.jar."
Torne (Richard Coles) [Wed, 5 Jun 2013 17:11:48 +0000 (17:11 +0000)]
Merge "Add proper deps for jarjar rules files."
T.R. Fullhart [Mon, 18 Mar 2013 17:31:26 +0000 (10:31 -0700)]
Add support for using custom signapk.jar.
Details:
* New --signapk_path, --extra_signapk_args, --java_path.
* New --public_key_suffix, --private_key_suffix so you can change the filenames.
* Fixes raising exceptions on error.
Change-Id: I0b7014b6d779d52ae896f95dfecb1bcccf536cf4
Torne (Richard Coles) [Tue, 4 Jun 2013 15:48:13 +0000 (16:48 +0100)]
Add proper deps for jarjar rules files.
Changes to the jarjar rules file for a module were not causing
rebuilds; add the missing dependency.
Change-Id: Ib78fa708681cbc414218fe84cc2c4282c619f45f
Doug Zongker [Tue, 4 Jun 2013 18:39:04 +0000 (18:39 +0000)]
Merge "improve OTA failure messages"
The Android Open Source Project [Tue, 4 Jun 2013 00:16:34 +0000 (17:16 -0700)]
am
e2fe6c04: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
e2fe6c041f65faf3279b663b4392f934b898a85b':
JWR64B
The Android Open Source Project [Mon, 3 Jun 2013 23:43:33 +0000 (16:43 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I1168e923d0907bf1888bc2f894f7addfb559ca61
The Android Automerger [Mon, 3 Jun 2013 22:51:04 +0000 (15:51 -0700)]
JWR64B
The Android Open Source Project [Mon, 3 Jun 2013 21:03:46 +0000 (14:03 -0700)]
am
20f6c310: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
20f6c310c70594e077310415b2756c9e1f42d6b5':
"JWR64"
"JWR63"
JWR60E
JWR60D
JWR60C
JWR60B
The Android Open Source Project [Mon, 3 Jun 2013 21:02:22 +0000 (14:02 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Ibaec6294f3598d965dba72d39859f24a76c8933b
Doug Zongker [Mon, 3 Jun 2013 19:07:12 +0000 (12:07 -0700)]
improve OTA failure messages
Replace OTA script constructs of the form:
assert(foo);
with
foo || abort("sensible message");
so that the log and the on-screen display is somewhat more accessible
to non-experts. (assert() displays the source code of the false
expression 'foo'.)
Change-Id: Ic99448e4466561d305b167cd4d5c1f0f2dbadcce
The Android Automerger [Mon, 3 Jun 2013 12:55:38 +0000 (05:55 -0700)]
"JWR64"
The Android Automerger [Mon, 3 Jun 2013 12:55:04 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Sun, 2 Jun 2013 12:56:48 +0000 (05:56 -0700)]
"JWR63"
The Android Automerger [Sun, 2 Jun 2013 12:55:14 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Fri, 31 May 2013 20:41:15 +0000 (13:41 -0700)]
JWR60E
Ying Wang [Fri, 31 May 2013 15:24:56 +0000 (15:24 +0000)]
Merge "Tweak proguard flags in the 2 files."
The Android Automerger [Fri, 31 May 2013 02:02:55 +0000 (19:02 -0700)]
JWR60D
Stephen Hines [Thu, 30 May 2013 22:34:00 +0000 (15:34 -0700)]
am
6c380fe5: am
1dd9f19e: Merge "add renderscript to support library javadocs" into jb-mr2-dev
* commit '
6c380fe5da492c526f81c894a069e63ab62613de':
add renderscript to support library javadocs
The Android Automerger [Thu, 30 May 2013 22:26:43 +0000 (15:26 -0700)]
JWR60C
The Android Automerger [Thu, 30 May 2013 21:36:32 +0000 (14:36 -0700)]
JWR60B
The Android Open Source Project [Thu, 30 May 2013 21:24:10 +0000 (14:24 -0700)]
am
041fd816: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
041fd81699448ff4fbcabeebe15bb7dedade9dfb':
"JWR60"
JWR59C
JWR59B
Stephen Hines [Thu, 30 May 2013 21:14:29 +0000 (14:14 -0700)]
am
1dd9f19e: Merge "add renderscript to support library javadocs" into jb-mr2-dev
* commit '
1dd9f19e8f020e691f08361668a1132181c267c5':
add renderscript to support library javadocs
Stephen Hines [Thu, 30 May 2013 21:09:35 +0000 (21:09 +0000)]
Merge "add renderscript to support library javadocs" into jb-mr2-dev
Ying Wang [Thu, 30 May 2013 17:45:46 +0000 (10:45 -0700)]
Tweak proguard flags in the 2 files.
So all most commonly-used flags go to proguard_basic_keeps.flags
and they will still be applied when LOCAL_PROGUARD_ENABLED=nosystem.
Bug:
9203442
Change-Id: If018076dc625ac1efe31898b179dbba850218aaf
The Android Open Source Project [Thu, 30 May 2013 14:31:18 +0000 (07:31 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Iaf7449c8a3d44b7d692291a65c03ec59c2d2aedb
The Android Automerger [Thu, 30 May 2013 12:57:12 +0000 (05:57 -0700)]
"JWR60"
The Android Automerger [Thu, 30 May 2013 12:55:21 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Thu, 30 May 2013 00:53:49 +0000 (17:53 -0700)]
JWR59C
The Android Automerger [Wed, 29 May 2013 22:40:24 +0000 (15:40 -0700)]
JWR59B
Kenny Root [Wed, 29 May 2013 22:30:23 +0000 (15:30 -0700)]
am
a422266b: am
9016d0ae: Merge "Fix signing process for SELinux file_contexts" into jb-mr2-dev
* commit '
a422266b1c66e9fa37fbfcf22f273aaa99f16f00':
Fix signing process for SELinux file_contexts
Kenny Root [Wed, 29 May 2013 22:26:26 +0000 (15:26 -0700)]
am
9016d0ae: Merge "Fix signing process for SELinux file_contexts" into jb-mr2-dev
* commit '
9016d0aef415e00df636b6407a05e5e08e430ed8':
Fix signing process for SELinux file_contexts
Kenny Root [Wed, 29 May 2013 22:13:31 +0000 (22:13 +0000)]
Merge "Fix signing process for SELinux file_contexts" into jb-mr2-dev
Kenny Root [Wed, 29 May 2013 19:59:35 +0000 (12:59 -0700)]
Fix signing process for SELinux file_contexts
When not building locally and just using a target-files.zip from some
other build, it still tries to access the file_contexts from the out/
directory. This change instead looks at the unzipped target-files.zip
hierarchy to grab that information.
Bug:
9191141
Change-Id: I6ea12e82d6c6376fcada412314c5eefc97ff4853
Scott Main [Tue, 28 May 2013 21:53:22 +0000 (14:53 -0700)]
add renderscript to support library javadocs
Bug:
9188088
Change-Id: I7c34a99b73dc01c78174e5b93e5a5d3085ff81ff
The Android Open Source Project [Wed, 29 May 2013 15:07:04 +0000 (08:07 -0700)]
am
34949064: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
349490646f72d63eb88fcb806a96248b4146d319':
"JWR59"
JWR58C
JWR58B
The Android Open Source Project [Wed, 29 May 2013 15:05:48 +0000 (08:05 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Ic2bedc28934c86a1d84c86ef081abba066b9f1e7
The Android Automerger [Wed, 29 May 2013 12:56:24 +0000 (05:56 -0700)]
"JWR59"
The Android Automerger [Wed, 29 May 2013 12:55:06 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Wed, 29 May 2013 01:15:01 +0000 (18:15 -0700)]
JWR58C
The Android Automerger [Tue, 28 May 2013 23:11:03 +0000 (16:11 -0700)]
JWR58B
The Android Open Source Project [Tue, 28 May 2013 20:50:15 +0000 (13:50 -0700)]
am
95940790: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
95940790ad7160cfc9d497a9fe49446970f90056':
"JWR58"
"JWR57"
"JWR56"
The Android Open Source Project [Tue, 28 May 2013 14:37:14 +0000 (07:37 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I2a3754df164d9a9b56a1db167e0f10369e92efbe
The Android Automerger [Tue, 28 May 2013 12:55:19 +0000 (05:55 -0700)]
"JWR58"
The Android Automerger [Tue, 28 May 2013 12:55:03 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Mon, 27 May 2013 12:55:38 +0000 (05:55 -0700)]
"JWR57"
The Android Automerger [Mon, 27 May 2013 12:55:05 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Sun, 26 May 2013 12:56:30 +0000 (05:56 -0700)]
"JWR56"
The Android Automerger [Sun, 26 May 2013 12:55:10 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Open Source Project [Fri, 24 May 2013 22:30:13 +0000 (15:30 -0700)]
am
94bcfa0a: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
94bcfa0a09ec7ff8adecfdefc7a4f288f36aead1':
JWR53F
JWR53E
JWR53D
JWR53C
JWR53B
The Android Open Source Project [Fri, 24 May 2013 22:28:07 +0000 (15:28 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I541e66a266a81d270b206ead6c8b5b67489d63ef
The Android Automerger [Fri, 24 May 2013 22:21:35 +0000 (15:21 -0700)]
JWR53F
The Android Automerger [Fri, 24 May 2013 19:23:06 +0000 (12:23 -0700)]
JWR53E
The Android Automerger [Fri, 24 May 2013 05:09:57 +0000 (22:09 -0700)]
JWR53D
The Android Automerger [Fri, 24 May 2013 02:58:17 +0000 (19:58 -0700)]
JWR53C
The Android Automerger [Thu, 23 May 2013 21:35:29 +0000 (14:35 -0700)]
JWR53B
Ying Wang [Thu, 23 May 2013 17:26:49 +0000 (10:26 -0700)]
Enable Proguard for eng build too.
With this change, all build variants are now with Proguard enabled,
unless you explicitly set DISABLE_PROGUARD to true.
Change-Id: I0f9b566b5ab3c3d961ffd6ab696e573bc59553b0
The Android Open Source Project [Thu, 23 May 2013 15:10:22 +0000 (08:10 -0700)]
am
5d8d1814: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
5d8d181494dd13f3f9f91102e32542c099626291':
"JWR53"
JWR52B
The Android Open Source Project [Thu, 23 May 2013 15:04:40 +0000 (08:04 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Ia0eaeb088ba74ba025573ac25315bc8d426a6a5b
The Android Automerger [Thu, 23 May 2013 12:56:28 +0000 (05:56 -0700)]
"JWR53"
The Android Automerger [Thu, 23 May 2013 12:55:11 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Thu, 23 May 2013 02:10:49 +0000 (19:10 -0700)]
JWR52B
Brian Carlstrom [Wed, 8 May 2013 18:03:26 +0000 (11:03 -0700)]
Add WITH_ART
(cherry picked from commit
6b7a0d2f1ff90d24e3ade9ccf82a084f5f999c1f)
Change-Id: If6e208f9fc859f31da2cd71fdc1ddbe1fc1ed7aa
The Android Open Source Project [Wed, 22 May 2013 14:24:08 +0000 (07:24 -0700)]
am
ab9fd481: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
ab9fd481634f7b32ad9d697fc6a57212c1fbf039':
"JWR52"
JWR51B
The Android Open Source Project [Wed, 22 May 2013 14:22:42 +0000 (07:22 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Id47cc82d638cc12e7db5abf7e9f6a0a164e551f3
The Android Automerger [Wed, 22 May 2013 12:56:16 +0000 (05:56 -0700)]
"JWR52"
The Android Automerger [Wed, 22 May 2013 12:55:08 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Wed, 22 May 2013 00:18:17 +0000 (17:18 -0700)]
JWR51B
Ying Wang [Tue, 21 May 2013 19:31:57 +0000 (12:31 -0700)]
am
210aee35: am
fa29872a: Merge "[MIPS] Disabled madd support for Ingenic Xburst CPUs."
* commit '
210aee35a9dec3b94ab0cfc247e6c89c1e387f19':
[MIPS] Disabled madd support for Ingenic Xburst CPUs.
Ying Wang [Tue, 21 May 2013 19:25:39 +0000 (12:25 -0700)]
am
fa29872a: Merge "[MIPS] Disabled madd support for Ingenic Xburst CPUs."
* commit '
fa29872ae08408f90e1282bff36a0bdba13d0fdc':
[MIPS] Disabled madd support for Ingenic Xburst CPUs.
Ying Wang [Tue, 21 May 2013 18:33:31 +0000 (18:33 +0000)]
Merge "[MIPS] Disabled madd support for Ingenic Xburst CPUs."
The Android Open Source Project [Tue, 21 May 2013 16:02:32 +0000 (09:02 -0700)]
am
fd5b59fe: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
fd5b59feba63a695977169e4f3fee3133af97c1e':
"JWR51"
JWR50B
The Android Open Source Project [Tue, 21 May 2013 15:58:48 +0000 (08:58 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I5ea4651068ddbac4e42244bd638b8cce98f03be2
The Android Automerger [Tue, 21 May 2013 14:47:57 +0000 (07:47 -0700)]
"JWR51"
The Android Automerger [Tue, 21 May 2013 14:46:33 +0000 (07:46 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Tue, 21 May 2013 00:09:55 +0000 (17:09 -0700)]
JWR50B
Christopher Ferris [Mon, 20 May 2013 23:47:26 +0000 (23:47 +0000)]
Merge "Add missing adbOptions in runhat."
gcondra@google.com [Mon, 20 May 2013 23:35:32 +0000 (16:35 -0700)]
am
cc9c2135: am
2e619b7c: Revert "Add the sepolicy.version file to the root directory."
* commit '
cc9c2135bc04489c382985270d6c5a444610b57e':
Revert "Add the sepolicy.version file to the root directory."
Christopher Ferris [Mon, 20 May 2013 23:30:10 +0000 (16:30 -0700)]
Add missing adbOptions in runhat.
One of the adb commands in runhat was not using the adbOptions and would
fail if specifying a single serial device with multiple connected devices.
Change-Id: I804a6fccc51090cdc78dc2af76bbc0a24d843e3d
gcondra@google.com [Mon, 20 May 2013 22:52:26 +0000 (15:52 -0700)]
am
2e619b7c: Revert "Add the sepolicy.version file to the root directory."
* commit '
2e619b7c5458cb3b381bd8a02076f549dba8d045':
Revert "Add the sepolicy.version file to the root directory."
Pete Delaney [Mon, 20 May 2013 22:27:20 +0000 (15:27 -0700)]
[MIPS] Disabled madd support for Ingenic Xburst CPUs.
1. Added xburst ARCH_VARIANT file 'mips32r2-fp-xburst.mk'.
a) Added -mno-fused-madd GCC option.
2. Removing -mno-fused-madd GCC option for LLVM.
Change-Id: I947a74eb89c05ae321417533c3c40241abc6f965
Signed-off-by: Pete Delaney <piet.delaney@imgtec.com>
Jean-Baptiste Queru [Mon, 20 May 2013 17:07:29 +0000 (10:07 -0700)]
am
64dbf369: (-s ours) Fake version number for AOSP master - do not merge
* commit '
64dbf369a864bb34c029366ff177a8239002a8ee':
Fake version number for AOSP master - do not merge
Jean-Baptiste Queru [Mon, 20 May 2013 16:50:39 +0000 (09:50 -0700)]
Fake version number for AOSP master - do not merge
Change-Id: Ib605660f5baabf791bbbefb5d73dbe90e85ad51d
The Android Open Source Project [Mon, 20 May 2013 15:22:44 +0000 (08:22 -0700)]
am
cb66f08b: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
cb66f08ba5dfcaf1554c8289d7f1e92e3f2f2a45':
"JWR50"
"JWR49"
JWR46C
The Android Open Source Project [Mon, 20 May 2013 15:20:11 +0000 (08:20 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I3e888cfc8bdddb707a2b06256dc7ed794e568ec4
The Android Automerger [Mon, 20 May 2013 12:55:38 +0000 (05:55 -0700)]
"JWR50"
The Android Automerger [Mon, 20 May 2013 12:55:06 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Sun, 19 May 2013 12:56:38 +0000 (05:56 -0700)]
"JWR49"
The Android Automerger [Sun, 19 May 2013 12:55:08 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Fri, 17 May 2013 20:50:50 +0000 (13:50 -0700)]
JWR46C
The Android Open Source Project [Fri, 17 May 2013 19:59:41 +0000 (12:59 -0700)]
am
958e66fe: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
958e66fe1803a6bf5880ad11c43825aa5a55a260':
JWR46B
"JWR46"
repo sync [Fri, 17 May 2013 19:57:52 +0000 (12:57 -0700)]
Revert "Add the sepolicy.version file to the root directory."
This reverts commit
83f646a0efdf69d84d3eb828eec74ec3881074f2.
OSDN Git Service
