Commit graph

13430 commits

Author SHA1 Message Date
The Android Open Source Project
9bfdf4d539 Reconcile with jb-mr2-release - do not merge
Change-Id: If2d4012040805ba406dd14909d6a6773b8060eef
2013-06-14 12:32:53 -07:00
Mike Lockwood
051a1740eb Add support for WITHOUT_CLANG
Change-Id: I12e776e44c69649bca34c35eff2ee7c75cfe62cd
2013-06-14 10:52:50 -07:00
The Android Automerger
3e7a208f65 JWR66M 2013-06-13 17:11:13 -07:00
The Android Open Source Project
977d5835a6 am 1e6cb5a8: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
* commit '1e6cb5a8f26420bf94c6bc194d95002d9366caa4':
  "JSR74"
  JWR66L
  JWR66K
2013-06-13 08:25:36 -07:00
The Android Open Source Project
1e6cb5a8f2 Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
Change-Id: I986e60e5558ca20ee361e768c46692bbbfc46237
2013-06-13 08:22:30 -07:00
The Android Automerger
d6ab7c62ef "JSR74" 2013-06-13 05:56:10 -07:00
The Android Automerger
e287119390 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-06-13 05:55:11 -07:00
The Android Automerger
8168ebb464 JWR66L 2013-06-12 23:25:14 -07:00
The Android Automerger
8a9f5ca3b7 JWR66K 2013-06-12 20:52:33 -07:00
The Android Open Source Project
0baade6562 am d8ef19b0: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit 'd8ef19b0c8a57daea726ad93edbbe396b9e9f5d3':
  JWR66J
  JWR66I
2013-06-12 18:06:07 -07:00
The Android Open Source Project
d8ef19b0c8 Reconcile with jb-mr2-release - do not merge
Change-Id: I3dff434f8e95a5c15b4ef4bca3c05bdfa163df0e
2013-06-12 18:03:58 -07:00
The Android Automerger
42cd97bbeb JWR66J 2013-06-12 17:06:04 -07:00
Ying Wang
951e0f1e8d am fe365531: am 1e1241ce: Dist static Java library modules.
* commit 'fe365531b0ee363640fb50d5a230c0b999fbbe4d':
  Dist static Java library modules.
2013-06-12 15:41:57 -07:00
Ying Wang
fe365531b0 am 1e1241ce: Dist static Java library modules.
* commit '1e1241ce3d4259bcc4a0039ed68fc5b3fc8069b5':
  Dist static Java library modules.
2013-06-12 15:38:05 -07:00
Ying Wang
1e1241ce3d Dist static Java library modules.
With this change, we can build and dist static jar files, as well as
apks.

Bug: 9386024
Change-Id: Iab4660d8dfd7a2d164714a2124445de298075901
2013-06-12 15:29:38 -07:00
The Android Automerger
8864c28634 JWR66I 2013-06-12 14:26:14 -07:00
Ying Wang
8b651c799a am 8f586805: am 38cdd442: Tweak proguard flags in the 2 files.
* commit '8f5868057c6c84760e8419792b0009cb1d133861':
  Tweak proguard flags in the 2 files.
2013-06-12 11:12:04 -07:00
Ying Wang
8f5868057c am 38cdd442: Tweak proguard flags in the 2 files.
* commit '38cdd4429f23d9a0d27a6d8cfe318c29b604afbf':
  Tweak proguard flags in the 2 files.
2013-06-12 11:09:33 -07:00
Ying Wang
38cdd4429f 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
2013-06-12 11:04:49 -07:00
The Android Open Source Project
4d889727c2 am 8870070d: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
* commit '8870070d426f910cc223b3ea4f2f33a1c477014a':
  "JSR73"
  JWR66H
2013-06-12 07:26:01 -07:00
The Android Open Source Project
8870070d42 Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
Change-Id: I9f012993eb7dccac74fec611f0ea1c8dcd71d93f
2013-06-12 07:23:10 -07:00
The Android Automerger
fba3d4e98f "JSR73" 2013-06-12 05:56:41 -07:00
The Android Automerger
625956b9ef merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-06-12 05:55:47 -07:00
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