Commit graph

10771 commits

Author SHA1 Message Date
Scott Main
af057169b7 am f1468dcd: am 896f9ec9: am 705e8a4f: docs: something whatever
* commit 'f1468dcd54d600b4e51d8d5962e0c9e3896f1a1e':
  docs: something whatever
2012-11-13 06:28:19 -08:00
Scott Main
f1468dcd54 am 896f9ec9: am 705e8a4f: docs: something whatever
* commit '896f9ec991a9d92f0a35129347ec1cb85661880c':
  docs: something whatever
2012-11-13 06:25:23 -08:00
Scott Main
896f9ec991 am 705e8a4f: docs: something whatever
* commit '705e8a4f6100486dbcf1530490e9761c1afa1a6e':
  docs: something whatever
2012-11-13 06:22:26 -08:00
Scott Main
705e8a4f61 docs: something whatever
Change-Id: I08120f1e27a488dfec03868758ab6de2e75fdc09
2012-11-13 05:36:12 -08:00
Scott Main
8626ef534e am c1b5b417: am deac4de5: am 55d99832: docs: changes to sdk page and script for toggles
* commit 'c1b5b41784846e7330aad4b4da41e78fb1044898':
  docs: changes to sdk page and script for toggles
2012-11-13 02:35:46 -08:00
Scott Main
c1b5b41784 am deac4de5: am 55d99832: docs: changes to sdk page and script for toggles
* commit 'deac4de56e3cdddabeeb6d4f8d4aea9e34ab11e3':
  docs: changes to sdk page and script for toggles
2012-11-13 02:32:41 -08:00
Scott Main
deac4de56e am 55d99832: docs: changes to sdk page and script for toggles
* commit '55d99832fd2631bc9453141ae3a23e2eb074ede0':
  docs: changes to sdk page and script for toggles
2012-11-13 02:29:52 -08:00
Scott Main
55d99832fd docs: changes to sdk page and script for toggles
Change-Id: Idef0c6099885cada3a4866ed7b5ec5b6f5078e39
2012-11-12 23:03:59 -08:00
Scott Main
daf5e757a7 am 112f0758: am 0a6deb1c: am 8fa72222: am 2953f0b0: am fef18c61: am db3678bc: add ADT Bundle to the download page
* commit '112f0758434a6e718601870266644e98219fdb1e':
  add ADT Bundle to the download page
2012-11-12 18:13:02 -08:00
Scott Main
112f075843 am 0a6deb1c: am 8fa72222: am 2953f0b0: am fef18c61: am db3678bc: add ADT Bundle to the download page
* commit '0a6deb1c69fc9f557330cde804dea3ff82fdf74f':
  add ADT Bundle to the download page
2012-11-12 18:11:01 -08:00
Scott Main
0a6deb1c69 am 8fa72222: am 2953f0b0: am fef18c61: am db3678bc: add ADT Bundle to the download page
* commit '8fa72222419fa0a94509e507f4450c941313590d':
  add ADT Bundle to the download page
2012-11-12 18:09:21 -08:00
Scott Main
8fa7222241 am 2953f0b0: am fef18c61: am db3678bc: add ADT Bundle to the download page
* commit '2953f0b0b1fcd350ff269b611a2b43fa62773943':
  add ADT Bundle to the download page
2012-11-12 18:07:58 -08:00
Scott Main
2953f0b0b1 am fef18c61: am db3678bc: add ADT Bundle to the download page
* commit 'fef18c61f5146d1a2eb7ed1f48bf5aaa2af08923':
  add ADT Bundle to the download page
2012-11-12 18:06:25 -08:00
Scott Main
fef18c61f5 am db3678bc: add ADT Bundle to the download page
* commit 'db3678bcaadf74b1a940a3dafb9fda4e238250be':
  add ADT Bundle to the download page
2012-11-12 18:05:00 -08:00
Scott Main
db3678bcaa add ADT Bundle to the download page
Change-Id: Ife533a32e29f2d5f1c58a42ad0b91c5053b44da4
2012-11-12 18:00:23 -08:00
Ying Wang
eb98e08893 am 865d851a: Merge "Remove the obsolete comments and change the misleading var name."
* commit '865d851a8012e13c35d573d98770b7187d32b7f7':
  Remove the obsolete comments and change the misleading var name.
2012-11-12 14:45:59 -08:00
Ying Wang
865d851a80 Merge "Remove the obsolete comments and change the misleading var name." 2012-11-12 14:34:25 -08:00
Ying Wang
85e8cda340 Remove the obsolete comments and change the misleading var name.
Change-Id: Ib19099cbce0133f5c7df44fa0fd80215809a1ad8
2012-11-12 14:31:20 -08:00
Andrew Hsieh
abfb25226a resolved conflicts for merge of 8b3ce5a3 to stage-aosp-master
Change-Id: I588a055812ddc8f4531c9d02994beb366f9aab3e
2012-11-12 12:50:03 -08:00
Andrew Hsieh
8b3ce5a3c7 Merge "Use prebuilt gcc for MacOSX" 2012-11-12 11:28:10 -08:00
Andrew Hsieh
e2e28f6d02 Use prebuilt gcc for MacOSX
1. Use prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1
   See https://android-review.googlesource.com/#/c/46223/
2. Rewrite logic dealing with mac_sdk_version to support all
   MacOSX SDK 10.6, 10.7 and 10.8.  Note that since
   ad2342375963c2468849c1f83a97158383db6511 emulator no longer
   depends on 10.6 to build.  Since the lowest SDK among intersection
   of the "available" and the "supported" SDKs is picked, add a
   new variable MAC_SDK_VERSION for developer really want to overwrite
   it.  MAC_SDK_VERSION still has to be one of the supported, though.
3. Improve mac_sdk_path detection to deal with case where Xcode
   *dmg is mounted only, not installed at /Applications.
4. Now we can retire BUILD_MAC_SDK_EXPERIMENTAL

Change-Id: I83e463556a857d527710f766de0e19e1b576151f
2012-11-12 10:44:52 -08:00
The Android Open Source Project
bc4bcf4ad0 am daa3e04e: am 2e939805: Reconcile with jb-mr1-release - do not merge
* commit 'daa3e04e485a037b38ff0d97a04fb1e0d139b143':
  JOP40C
  JOP40B
2012-11-12 07:31:11 -08:00
The Android Open Source Project
daa3e04e48 am 2e939805: Reconcile with jb-mr1-release - do not merge
* commit '2e939805afafebced02bc3ed027807291ddd5dc4':
  JOP40C
  JOP40B
2012-11-12 07:28:31 -08:00
The Android Open Source Project
2e939805af Reconcile with jb-mr1-release - do not merge
Change-Id: Ie852ca3761e50d4e84e554572faa3920e1880821
2012-11-12 07:26:05 -08:00
The Android Automerger
3f0e0921da JOP40C 2012-11-09 22:51:38 -08:00
The Android Open Source Project
2c76626789 am 976a70c4: am 5194366b: Reconcile with jb-mr1-release - do not merge
* commit '976a70c41ec0dd6f283c1bec8b2c0c15deb373c0':
  JOP40
2012-11-09 22:41:18 -08:00
The Android Automerger
7f8d110a29 JOP40B 2012-11-09 16:25:54 -08:00
The Android Automerger
d06f594be8 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-11-09 16:25:12 -08:00
The Android Open Source Project
976a70c41e am 5194366b: Reconcile with jb-mr1-release - do not merge
* commit '5194366bcdb91d5908c8db50f002a891fe8b8bde':
  JOP40
2012-11-09 13:09:05 -08:00
The Android Open Source Project
5194366bcd Reconcile with jb-mr1-release - do not merge
Change-Id: I482192b20bde4fcc55f9a781e37256d396c2c9fb
2012-11-09 13:07:03 -08:00
The Android Automerger
8803150a7b JOP40 2012-11-09 12:51:06 -08:00
The Android Automerger
9e819c8a14 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-11-09 12:50:33 -08:00
Andrew Hsieh
fc76f0eb17 am 2ea957a3: Merge "Revise checks for MacOSX to build emulator"
* commit '2ea957a373018ba6773c621065164256f0d84078':
  Revise checks for MacOSX to build emulator
2012-11-09 10:28:36 -08:00
Andrew Hsieh
2ea957a373 Merge "Revise checks for MacOSX to build emulator" 2012-11-09 09:33:39 -08:00
Jean-Baptiste Queru
dde4fc127c Version number for AOSP master - do not merge
Change-Id: I67dab0de027ab458de326375a3f8077594f702cb
2012-11-09 07:46:14 -08:00
The Android Open Source Project
7d07fd6e91 am 0f4d2683: am 79ab2553: Reconcile with jb-mr1-release - do not merge
* commit '0f4d268311249113eeaf937dbe51ad2d94c7063f':
  JOP39B
2012-11-09 07:24:03 -08:00
The Android Open Source Project
0f4d268311 am 79ab2553: Reconcile with jb-mr1-release - do not merge
* commit '79ab2553a77c0f111e990e3aec342ce0cde87fc9':
  JOP39B
2012-11-09 07:22:04 -08:00
The Android Open Source Project
79ab2553a7 Reconcile with jb-mr1-release - do not merge
Change-Id: I5d3a0c41a1626bdf59f75cd8d989d0d725fc4680
2012-11-09 07:19:14 -08:00
Andrew Hsieh
1dcca61869 Revise checks for MacOSX to build emulator
1. Check $(HOST_CC) instead of gcc for llvm-gcc.
2. Remvoe Mac SDK 10.4 check because emulator uses
   the same SDK version as the rest of framework

Change-Id: I4071fd45dc09a18c5341ad79e6a85e61df060fb4
2012-11-09 02:06:33 -08:00
The Android Automerger
46527fef4d JOP39B 2012-11-08 17:53:45 -08:00
The Android Automerger
6151f7ee62 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-11-08 17:53:10 -08:00
The Android Open Source Project
8c9ca6491b am 36f9ca38: am 17e06817: Reconcile with jb-mr1-release - do not merge
* commit '36f9ca38266580c7bdac9c83a03a2b60daddf3a9':
  JOP39
2012-11-08 15:47:51 -08:00
The Android Open Source Project
760e37539f am a6f37679: am d84f0294: Reconcile with jb-mr1-release - do not merge
* commit 'a6f376792eb8910ee4a76d59b48ebe5fcd2f4aec':
  JOP38C
  JOP38B
2012-11-08 15:44:29 -08:00
Ying Wang
989d211b68 am f99f5e89: am d0b1977f: am 0138951e: Collapse multiple --extra-packages into one.
* commit 'f99f5e89a15cada28dc692a5a7ce3413bdd965b4':
  Collapse multiple --extra-packages into one.
2012-11-08 15:43:13 -08:00
The Android Open Source Project
269abb949d am 151c3655: am ab529f13: Reconcile with jb-mr1-release - do not merge
* commit '151c3655cb63111b47cff4a297f738bab9c567a2':
  JOP38
2012-11-08 15:42:13 -08:00
The Android Open Source Project
36f9ca3826 am 17e06817: Reconcile with jb-mr1-release - do not merge
* commit '17e06817a22f2a13baddec627dbf385d8799a604':
  JOP39
2012-11-08 14:20:58 -08:00
The Android Open Source Project
17e06817a2 Reconcile with jb-mr1-release - do not merge
Change-Id: I1ff0e098597e9de600fbec6b6661206e66a72afc
2012-11-08 14:18:55 -08:00
The Android Automerger
81d04b7a6c JOP39 2012-11-08 13:54:33 -08:00
The Android Automerger
5e98bbbd26 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-11-08 13:53:50 -08:00
The Android Open Source Project
a6f376792e am d84f0294: Reconcile with jb-mr1-release - do not merge
* commit 'd84f02944f78595c3f72eb7e8bc422c63bd6ce89':
  JOP38C
  JOP38B
2012-11-08 08:56:04 -08:00