Ying Wang
bba6263203
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
2013-05-23 10:26:49 -07:00
The Android Open Source Project
efdfb7d893
am 5d8d1814: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit '5d8d181494dd13f3f9f91102e32542c099626291':
"JWR53"
JWR52B
2013-05-23 08:10:22 -07:00
The Android Open Source Project
5d8d181494
Reconcile with jb-mr2-release - do not merge
...
Change-Id: Ia0eaeb088ba74ba025573ac25315bc8d426a6a5b
2013-05-23 08:04:40 -07:00
The Android Automerger
9eb9f2d0af
"JWR53"
2013-05-23 05:56:28 -07:00
The Android Automerger
059d22c259
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-05-23 05:55:11 -07:00
The Android Automerger
6f0c461388
JWR52B
2013-05-22 19:10:49 -07:00
Brian Carlstrom
6901768e36
Add WITH_ART
...
(cherry picked from commit 6b7a0d2f1ff90d24e3ade9ccf82a084f5f999c1f)
Change-Id: If6e208f9fc859f31da2cd71fdc1ddbe1fc1ed7aa
2013-05-22 10:49:57 -07:00
The Android Open Source Project
c573ab3362
am ab9fd481: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit 'ab9fd481634f7b32ad9d697fc6a57212c1fbf039':
"JWR52"
JWR51B
2013-05-22 07:24:08 -07:00
The Android Open Source Project
ab9fd48163
Reconcile with jb-mr2-release - do not merge
...
Change-Id: Id47cc82d638cc12e7db5abf7e9f6a0a164e551f3
2013-05-22 07:22:42 -07:00
The Android Automerger
73e32267c0
"JWR52"
2013-05-22 05:56:16 -07:00
The Android Automerger
bc535d3448
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-05-22 05:55:08 -07:00
The Android Automerger
45fc413973
JWR51B
2013-05-21 17:18:17 -07:00
Ying Wang
a25b9b83bf
am 210aee35: am fa29872a: Merge "[MIPS] Disabled madd support for Ingenic Xburst CPUs."
...
* commit '210aee35a9dec3b94ab0cfc247e6c89c1e387f19':
[MIPS] Disabled madd support for Ingenic Xburst CPUs.
2013-05-21 12:31:57 -07:00
Ying Wang
210aee35a9
am fa29872a: Merge "[MIPS] Disabled madd support for Ingenic Xburst CPUs."
...
* commit 'fa29872ae08408f90e1282bff36a0bdba13d0fdc':
[MIPS] Disabled madd support for Ingenic Xburst CPUs.
2013-05-21 12:25:39 -07:00
Ying Wang
fa29872ae0
Merge "[MIPS] Disabled madd support for Ingenic Xburst CPUs."
2013-05-21 18:33:32 +00:00
The Android Open Source Project
c0e3c96d83
am fd5b59fe: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit 'fd5b59feba63a695977169e4f3fee3133af97c1e':
"JWR51"
JWR50B
2013-05-21 09:02:32 -07:00
The Android Open Source Project
fd5b59feba
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I5ea4651068ddbac4e42244bd638b8cce98f03be2
2013-05-21 08:58:48 -07:00
The Android Automerger
94c03acdb5
"JWR51"
2013-05-21 07:47:57 -07:00
The Android Automerger
0d1eb648d1
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-05-21 07:46:33 -07:00
The Android Automerger
69a1b28ac8
JWR50B
2013-05-20 17:09:55 -07:00
Christopher Ferris
a4682460a9
Merge "Add missing adbOptions in runhat."
2013-05-20 23:47:26 +00:00
gcondra@google.com
b839579681
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."
2013-05-20 16:35:32 -07:00
Christopher Ferris
764b4f80fd
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
2013-05-20 16:30:10 -07:00
gcondra@google.com
cc9c2135bc
am 2e619b7c: Revert "Add the sepolicy.version file to the root directory."
...
* commit '2e619b7c5458cb3b381bd8a02076f549dba8d045':
Revert "Add the sepolicy.version file to the root directory."
2013-05-20 15:52:26 -07:00
Pete Delaney
90ce453470
[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>
2013-05-20 15:27:20 -07:00
Jean-Baptiste Queru
b063aac67e
am 64dbf369: (-s ours) Fake version number for AOSP master - do not merge
...
* commit '64dbf369a864bb34c029366ff177a8239002a8ee':
Fake version number for AOSP master - do not merge
2013-05-20 10:07:29 -07:00
Jean-Baptiste Queru
64dbf369a8
Fake version number for AOSP master - do not merge
...
Change-Id: Ib605660f5baabf791bbbefb5d73dbe90e85ad51d
2013-05-20 09:50:39 -07:00
The Android Open Source Project
82c2f29d14
am cb66f08b: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit 'cb66f08ba5dfcaf1554c8289d7f1e92e3f2f2a45':
"JWR50"
"JWR49"
JWR46C
2013-05-20 08:22:44 -07:00
The Android Open Source Project
cb66f08ba5
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I3e888cfc8bdddb707a2b06256dc7ed794e568ec4
2013-05-20 08:20:11 -07:00
The Android Automerger
277a46a5df
"JWR50"
2013-05-20 05:55:38 -07:00
The Android Automerger
ca7701f0b8
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-05-20 05:55:06 -07:00
The Android Automerger
6290bbdae1
"JWR49"
2013-05-19 05:56:38 -07:00
The Android Automerger
cedc362ab0
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-05-19 05:55:08 -07:00
The Android Automerger
9f734d4ac4
JWR46C
2013-05-17 13:50:50 -07:00
The Android Open Source Project
3705f3a3f7
am 958e66fe: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit '958e66fe1803a6bf5880ad11c43825aa5a55a260':
JWR46B
"JWR46"
2013-05-17 12:59:41 -07:00
repo sync
2e619b7c54
Revert "Add the sepolicy.version file to the root directory."
...
This reverts commit 83f646a0ef
.
2013-05-17 12:57:52 -07:00
The Android Open Source Project
958e66fe18
Reconcile with jb-mr2-release - do not merge
...
Change-Id: Ic1c996fd98ce4f0db3bbe40a3f3fe9cb1504d3ab
2013-05-17 12:54:16 -07:00
Ying Wang
a34a0030b8
am 82574cb1: am 57453519: Split out proguard_basic_keeps.flags
...
* commit '82574cb101d34981bccd56513059b3d0bd3267a0':
Split out proguard_basic_keeps.flags
2013-05-17 10:35:48 -07:00
Ying Wang
82574cb101
am 57453519: Split out proguard_basic_keeps.flags
...
* commit '57453519084feb13f8a2c00b6985b32427a06b5a':
Split out proguard_basic_keeps.flags
2013-05-17 10:33:11 -07:00
Ying Wang
5745351908
Split out proguard_basic_keeps.flags
...
For 'LOCAL_PROGUARD_ENABLED := nosystem' we still include
proguard_basic_keeps.flags.
Change-Id: I43ee7e98d2aaeb84879441f90ab6839c0e8f4e65
2013-05-17 10:02:00 -07:00
The Android Automerger
3061af8a7e
JWR46B
2013-05-16 15:21:01 -07:00
The Android Automerger
0a8805716c
"JWR46"
2013-05-16 05:56:48 -07:00
The Android Automerger
01334f9b7d
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-05-16 05:55:20 -07:00
The Android Open Source Project
35e85bdd9d
am c0e9713a: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit 'c0e9713ace444e7627f44bbe3feb7c5ae479e834': (42 commits)
JWR45B
"JWR45"
"JWR44B"
"JWR44"
"JWR43"
JWR39D
JWR39C
JWR39B
"JWR39"
JWR38B
"JWR38"
"JWR37"
JWR36C
JWR36B
"JWR36"
JWR32E
JWR32D
JWR32C
JWR32B
"JWR32"
...
2013-05-16 05:48:13 -07:00
The Android Open Source Project
c0e9713ace
Reconcile with jb-mr2-release - do not merge
...
Change-Id: Id8977deab29bcfaf875ff4431c398e245f61dfc5
2013-05-16 05:42:55 -07:00
Rom Lemarchand
88249ced78
Merge "core: combo: arm: add cortex-a8 target"
2013-05-16 03:15:55 +00:00
The Android Automerger
f91381bd25
JWR45B
2013-05-15 16:42:18 -07:00
gcondra@google.com
8f8e35d7dd
am 809b537e: am 046ed25f: Merge "Add the sepolicy.version file to the root directory." into jb-mr2-dev
...
* commit '809b537e4a9fa7007bb455a630f999514f0f0cee':
Add the sepolicy.version file to the root directory.
2013-05-15 13:37:24 -07:00
gcondra@google.com
809b537e4a
am 046ed25f: Merge "Add the sepolicy.version file to the root directory." into jb-mr2-dev
...
* commit '046ed25f5212a3778868c28ad6695fb6f8ce26d2':
Add the sepolicy.version file to the root directory.
2013-05-15 13:34:48 -07:00
repo sync
046ed25f52
Merge "Add the sepolicy.version file to the root directory." into jb-mr2-dev
2013-05-15 17:31:01 +00:00