StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,665 Commits 1 Branch 0 Tags
9e38d6bf1bf78a00d8f4288e6444be358a70a692
Commit Graph

7665 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Baptiste Queru
7a8efe57a9 Merge "Remove non-existent AlarmProvider to fix SDK build." 2012-01-24 07:50:02 -08:00
The Android Automerger
a45eafea13 IMM20C 2012-01-23 16:55:54 -08:00
Ying Wang
c3dbeb5df1 Remove non-existent AlarmProvider to fix SDK build. 
Change-Id: Ifcd087b9022f29b4b7065a72cafbbc6b3704860b
 2012-01-23 10:53:23 -08:00
The Android Open Source Project
5147518347 Reconcile with ics-mr1-release 
Change-Id: I6e64890cacfdb167f2f0c7a5e3917284e391ce11
 2012-01-23 10:15:33 -08:00
The Android Automerger
ec87a47401 IMM20B 2012-01-20 16:31:06 -08:00
The Android Automerger
5cb3f9d271 IMM20 2012-01-20 16:15:22 -08:00
The Android Automerger
282074349f merge in ics-mr1-release history after reset to ics-mr1 2012-01-20 16:11:14 -08:00
The Android Open Source Project
c541cd6ecb Reconcile with ics-mr1-release 
Change-Id: I3bdc5d19073e63e031b684bede64b1f5ebdf13e7
 2012-01-20 10:25:20 -08:00
The Android Automerger
94e1e3b914 IMM19 2012-01-19 16:31:16 -08:00
The Android Automerger
84eb1e95ab merge in ics-mr1-release history after reset to ics-mr1 2012-01-19 16:27:27 -08:00
The Android Open Source Project
c9054b11fa Reconcile with ics-mr1-release 
Change-Id: I06332ff4f1ca17df8303819c8ea85cf5f63712ca
 2012-01-19 13:06:25 -08:00
The Android Automerger
0ce12ef01d IMM18 2012-01-18 21:20:54 -08:00
The Android Automerger
eec18b3e63 merge in ics-mr1-release history after reset to ics-mr1 2012-01-18 21:16:29 -08:00
The Android Automerger
958ac1c5f8 IMM13 2012-01-13 16:21:18 -08:00
The Android Automerger
59fafc7c9b merge in ics-mr1-release history after reset to ics-mr1 2012-01-13 16:16:51 -08:00
Jean-Baptiste Queru
da3631dbd1 am fdbb9f94: am 96a228bd: Merge "Remove mention of layoutopt/uix as they are gone." 
* commit 'fdbb9f94bc4b22f60fb46d0babb52c2a0d047aef':
  Remove mention of layoutopt/uix as they are gone.
 2012-01-12 17:20:28 -08:00
Jean-Baptiste Queru
fdbb9f94bc am 96a228bd: Merge "Remove mention of layoutopt/uix as they are gone." 
* commit '96a228bd7904b83274575522a267d178b3da2341':
  Remove mention of layoutopt/uix as they are gone.
 2012-01-12 17:18:48 -08:00
Jean-Baptiste Queru
96a228bd79 Merge "Remove mention of layoutopt/uix as they are gone." 2012-01-12 14:07:20 -08:00
The Android Automerger
604b5429ba IMM12 2012-01-12 14:04:09 -08:00
The Android Automerger
913d46388f merge in ics-mr1-release history after reset to ics-mr1 2012-01-12 14:00:23 -08:00
The Android Open Source Project
6019f7b095 Reconcile with ics-mr1-release 
Change-Id: I8aa81509837cca423f8ac241d97e45d822086acf
 2012-01-12 08:56:04 -08:00
Xavier Ducrohet
4b5e4ba5fd Remove mention of layoutopt/uix as they are gone. 2012-01-11 18:07:31 -08:00
The Android Automerger
6add6c759a IMM11 2012-01-11 16:31:51 -08:00
The Android Automerger
5153c456df merge in ics-mr1-release history after reset to ics-mr1 2012-01-11 16:27:43 -08:00
Scott Main
5c26786314 am f962eb10: Merge "docs: add css for Android Design links and add link to site header" into ics-mr1 
* commit 'f962eb101b21814556f4edeb7128508d47cf5564':
  docs: add css for Android Design links and add link to site header
 2012-01-10 17:16:53 -08:00
Scott Main
f962eb101b Merge "docs: add css for Android Design links and add link to site header" into ics-mr1 2012-01-10 17:14:34 -08:00
Vladimir Chtchetkine
0216925157 am 2cbcd24b: Cherry-picked from e6b969f3b in master. Do not merge. 
* commit '2cbcd24ba708be5e387b8bf54351f5c2df7abbec':
  Cherry-picked from e6b969f3b in master. Do not merge.
 2012-01-10 16:42:47 -08:00
Vladimir Chtchetkine
2cbcd24ba7 Cherry-picked from e6b969f3b in master. Do not merge. 
Add boot property enabling ADBD over QEMU

Emulator and system image now support ADBD communication over QEMUD pipe rather
than over a TCP port forwarding. However, emulator has to know ahead of time
(before system starts booting) whether or not the system image supports ADBD
over pipe to properly setup the communication. For that, we introduce a boot
property "ro.adb.qemu" that is readable by the emulator early enough for the
proper ADB communication setup.

Change-Id: I978489c5acf46177b520e775d745bcc78f469837
 2012-01-10 16:31:08 -08:00
Scott Main
b10b282b43 docs: add css for Android Design links and add link to site header 
Change-Id: I0a9469519076b1c5b9d7c121df1f2c731a08d2cb
 2012-01-10 09:59:22 -08:00
The Android Open Source Project
2921f03d71 Reconcile with ics-mr1-release 
Change-Id: I6903bc47ab690fd56612f4e0e6289bf7a9799dca
 2012-01-06 18:14:56 -08:00
Jean-Baptiste Queru
9caacbd743 am 5ea72eff: Use the new location of the emulator kernel 
* commit '5ea72effbd944891708d2d6fb61055830e617701':
  Use the new location of the emulator kernel
 2012-01-06 17:37:02 -08:00
Jean-Baptiste Queru
5ea72effbd Use the new location of the emulator kernel 2012-01-06 17:02:24 -08:00
The Android Automerger
110ddac4a5 IMM06 2012-01-06 16:34:51 -08:00
The Android Automerger
adfb341695 merge in ics-mr1-release history after reset to ics-mr1 2012-01-06 16:31:06 -08:00
Jean-Baptiste Queru
da1c81abe4 am a230c4d0: Reference kernel notice in the new location 
* commit 'a230c4d049258915f6614e7a3fadc2dcfec3e160':
  Reference kernel notice in the new location
 2012-01-06 15:18:21 -08:00
Jean-Baptiste Queru
a230c4d049 Reference kernel notice in the new location 2012-01-06 15:05:53 -08:00
The Android Open Source Project
943f9a58a3 Reconcile with ics-mr1-release 
Change-Id: Iaa3637a3db5b9f2c8c4721a8ea2cb230336753f5
 2012-01-05 07:45:15 -08:00
Al Sutton
1964c8ed2d am d8765f0f: am 80cfc37d: Partial fix for emulator under Lion. 
* commit 'd8765f0f843e78c691c77264619125954d710b1a':
  Partial fix for emulator under Lion.
 2012-01-04 20:41:53 -08:00
Al Sutton
d8765f0f84 am 80cfc37d: Partial fix for emulator under Lion. 
* commit '80cfc37d0f0ddbb7db09b7662b84e816ab409537':
  Partial fix for emulator under Lion.
 2012-01-04 20:40:35 -08:00
The Android Automerger
ee0472e8a5 IMM04 2012-01-04 16:45:21 -08:00
Ed Heyl
6a20329368 Merge commit '9a46327e' into ics-mr1-plus-aosp 2012-01-04 16:42:14 -08:00
The Android Automerger
4f7927364a merge in ics-mr1-release history after reset to ics-mr1 2012-01-04 16:41:01 -08:00
Ed Heyl
9a46327e12 increment version to 4.0.4 
Change-Id: I156516aedb714f589bd0ae2d39bc9e273b775276
 2012-01-04 16:34:18 -08:00
Al Sutton
80cfc37d0f Partial fix for emulator under Lion. 
Don't use -Wl,-dynamic on Lion
 2012-01-04 15:16:50 -08:00
Conley Owens
f3c068db26 am d38c870d: Get build system to work with Make 3.82 
* commit 'd38c870d2e168b051692b20ade0fc966c9e2daf7':
  Get build system to work with Make 3.82
 2011-12-22 16:52:42 -08:00
Conley Owens
d38c870d2e Get build system to work with Make 3.82 
Note: `sort` can't seem to handle newlines in 3.82.

Change-Id: Ieeaee1d19688688a02e396bbc5b4dea26e7f6943
 2011-12-22 15:16:05 -08:00
Al Sutton
657aeac842 am 9ce06f11: Don\'t run ranlib on MacOS 10.7 
* commit '9ce06f11d69f5154843c234fe0624f9e70d39359':
  Don't run ranlib on MacOS 10.7
 2011-12-21 16:45:21 -08:00
Atte Peltomaki
05e98055fd am 60fe963c: build: explicitly define dependency files 
* commit '60fe963c63c1b98255ad1cf40573b81b5d90d9c3':
  build: explicitly define dependency files
 2011-12-21 16:45:20 -08:00
Al Sutton
9ce06f11d6 Don't run ranlib on MacOS 10.7 
Change-Id: I74f4623e6044dd804669aaa70c6e410fa8988d75
 2011-12-21 13:12:33 -08:00
Atte Peltomaki
60fe963c63 build: explicitly define dependency files 
Groundwork for distcc support in Android build system,
see distcc FAQ for details on why -MF is needed:
http://distcc.googlecode.com/svn/trunk/doc/web/faq.html
 2011-12-21 09:24:09 -08:00