Commit graph

13257 commits

Author SHA1 Message Date
The Android Automerger
d6da9bb65e JWR66H 2013-06-11 17:39:53 -07:00
The Android Open Source Project
cb066089c5 am 31b161ce: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '31b161cedce884cb7a1426f810d4e1cba9d33f46':
  "JSR72"
2013-06-11 15:37:02 -07:00
The Android Open Source Project
31b161cedc Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I40a07d0eebc9a1ff517241b9788f30c047a62692
2013-06-11 14:56:40 -07:00
Torne (Richard Coles)
4297ce7d0e Merge "Add webviewchromium to the preopt jar list." 2013-06-11 13:13:45 +00:00
The Android Automerger
b6a48228f9 "JSR72" 2013-06-11 05:56:01 -07:00
The Android Automerger
6b1c32c580 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-06-11 05:55:07 -07:00
The Android Open Source Project
c3e7c3f765 am 63452300: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '6345230095ac4ac7eb45c71caccd5a4b02942a8e':
  JWR66G
  JWR66F
  JWR66E
2013-06-10 18:21:08 -07:00
The Android Open Source Project
6345230095 Reconcile with jb-mr2-release - do not merge
Change-Id: I9644ec405e9bd0ce498ab424f5f38cf2920ea1d6
2013-06-10 18:19:13 -07:00
The Android Automerger
337ee5bc59 JWR66G 2013-06-10 16:45:28 -07:00
The Android Automerger
3fbee5a1b5 JWR66F 2013-06-10 16:07:05 -07:00
The Android Automerger
1104a5012d JWR66E 2013-06-10 15:16:12 -07:00
The Android Open Source Project
4ed273cbc2 am 6c1d6385: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
* commit '6c1d6385622798247881e8750864d17f49038e4c':
  "JSR71"
  "JSR70"
  JWR66D
  JWR66C
  JWR66B
2013-06-10 11:11:50 -07:00
The Android Open Source Project
6c1d638562 Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
Change-Id: I80cacfe6593b8595da9df2827790fc763c1a25ee
2013-06-10 08:13:29 -07:00
The Android Automerger
b2b3db347f "JSR71" 2013-06-10 05:55:35 -07:00
The Android Automerger
0b157b8f29 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-06-10 05:55:03 -07:00
The Android Automerger
565af6a260 "JSR70" 2013-06-09 05:56:51 -07:00
The Android Automerger
e1cca6e567 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-06-09 05:55:22 -07:00
The Android Automerger
dd4fad0ce9 JWR66D 2013-06-07 15:13:44 -07:00
Ying Wang
d72db32f84 Remove unnecessary dependencies between host and target modules.
With this change, modules introduced by LOCAL_REQUIRED_MODULES will be
split by host/target: target modules only depend on target modules and
host modules only depend on host modules.

Bug: 9303948
Change-Id: I4078a7983aa3c00e99534f3f170dfe4b66b12287
2013-06-06 18:05:53 -07:00
The Android Automerger
c8647435bf JWR66C 2013-06-06 16:42:07 -07:00
The Android Automerger
664a0bbe48 JWR66B 2013-06-06 15:09:23 -07:00
The Android Open Source Project
fae7808708 am f2d5533e: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
* commit 'f2d5533e87b18069b77abea531dfdee627306887':
  "JSR67"
  JWR66
  "JSR66"
  JWR65
2013-06-06 10:38:55 -07:00
The Android Open Source Project
f2d5533e87 Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
Change-Id: I23c04c52ecd129d541eaaf3a3a597e5533a6bc59
2013-06-06 10:36:58 -07:00
Torne (Richard Coles)
ef5d599600 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
2013-06-06 14:57:42 +01:00
The Android Automerger
bdcb7fcde2 "JSR67" 2013-06-06 05:56:22 -07:00
The Android Automerger
0d0ae245c2 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-06-06 05:55:18 -07:00
Stephen Hines
9a90a82c92 Remove abcc from build.
Change-Id: I9ca5deea98adbba03081349c16a391a9dd84e347
2013-06-05 20:25:40 -07:00
T.R. Fullhart
2de8a1e988 am cfe8d122: am 37e1052c: Add support for using custom signapk.jar.
* commit 'cfe8d12213daf8b6de51679ee9686c4042ed944e':
  Add support for using custom signapk.jar.
2013-06-05 16:38:11 -07:00
T.R. Fullhart
cfe8d12213 am 37e1052c: Add support for using custom signapk.jar.
* commit '37e1052c99c1ba045e8d2197637055ceb4b0c308':
  Add support for using custom signapk.jar.
2013-06-05 16:36:49 -07:00
The Android Automerger
afeb5b4779 JWR66 2013-06-05 15:35:01 -07:00
T.R. Fullhart
37e1052c99 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 a28acc6972)
2013-06-05 22:17:59 +00:00
Clay Murphy
8d03f9e519 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
2013-06-05 14:00:20 -07:00
Clay Murphy
0b6a52d955 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
2013-06-05 13:56:56 -07:00
Clay Murphy
49d8686488 docs: Adding styles needed by devices/tech/dalvik/dalvik-bytecode.html
Bug: 8905394

Change-Id: I3a89f9da01d92efd2ea6d9900305ea16a0316d63
2013-06-05 12:06:06 -07:00
The Android Automerger
dccc4ba344 "JSR66" 2013-06-05 11:17:07 -07:00
T.R. Fullhart
e9a1f47e65 Merge "Add support for using custom signapk.jar." 2013-06-05 17:50:40 +00:00
Torne (Richard Coles)
9b36317b4e Merge "Add proper deps for jarjar rules files." 2013-06-05 17:11:49 +00:00
The Android Automerger
731ca0eaa2 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-06-05 10:00:40 -07:00
T.R. Fullhart
a28acc6972 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
2013-06-05 09:57:55 -07:00
Torne (Richard Coles)
d919c7a314 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
2013-06-05 14:25:47 +01:00
The Android Automerger
1ce7555733 JWR65 2013-06-04 11:54:20 -07:00
Doug Zongker
12e560ebde Merge "improve OTA failure messages" 2013-06-04 18:39:04 +00:00
The Android Open Source Project
ffb54540a7 am e2fe6c04: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit 'e2fe6c041f65faf3279b663b4392f934b898a85b':
  JWR64B
2013-06-03 17:16:34 -07:00
The Android Open Source Project
e2fe6c041f Reconcile with jb-mr2-release - do not merge
Change-Id: I1168e923d0907bf1888bc2f894f7addfb559ca61
2013-06-03 16:43:33 -07:00
The Android Automerger
3f7da79c4e JWR64B 2013-06-03 15:51:04 -07:00
The Android Open Source Project
f39d05083d am 20f6c310: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '20f6c310c70594e077310415b2756c9e1f42d6b5':
  "JWR64"
  "JWR63"
  JWR60E
  JWR60D
  JWR60C
  JWR60B
2013-06-03 14:03:46 -07:00
The Android Open Source Project
20f6c310c7 Reconcile with jb-mr2-release - do not merge
Change-Id: Ibaec6294f3598d965dba72d39859f24a76c8933b
2013-06-03 14:02:22 -07:00
Doug Zongker
0d92f1f13a 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
2013-06-03 12:07:12 -07:00
The Android Automerger
8c5d8a6f94 "JWR64" 2013-06-03 05:55:38 -07:00
The Android Automerger
824a388645 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-06-03 05:55:04 -07:00