Ying Wang
06f3f54fc0
Add framework/native to fix build.
...
No framework/native is split out from framework/base.
Change-Id: I3b596a98feee01f433fa0e88d81d780315a3ebb8
2012-03-09 10:04:22 -08:00
Xavier Ducrohet
45678a32d4
am e3f5f497: (-s ours) am 83bf8d16: am 88d97250: Prepare for doc package update in rev 2. do not merge.
...
* commit 'e3f5f497b240f90bf3455e031dc5cc230d12fcd2':
2012-03-08 08:08:50 -08:00
Xavier Ducrohet
be3a667619
am abcaa390: (-s ours) am 624c4870: am 92b3b050: Add a prebuilt of the gridlayout support library. do not merge
...
* commit 'abcaa39070a6d02ccdaceae11b856545df959a23':
2012-03-08 08:08:49 -08:00
Xavier Ducrohet
42b46a0044
am 3a499b0f: (-s ours) am 8438213c: am 88d97250: Prepare for doc package update in rev 2. do not merge.
...
* commit '3a499b0fede7508c09dcedb16ea35ede3ade5d03':
Prepare for doc package update in rev 2. do not merge.
2012-03-08 08:08:48 -08:00
Xavier Ducrohet
e18f7959dc
am 1754063f: (-s ours) am 198705d1: am 92b3b050: Add a prebuilt of the gridlayout support library. do not merge
...
* commit '1754063ff021083adeed4c446f6df285cb018e06':
Add a prebuilt of the gridlayout support library. do not merge
2012-03-08 08:08:48 -08:00
Xavier Ducrohet
e3f5f497b2
am 83bf8d16: am 88d97250: Prepare for doc package update in rev 2. do not merge.
...
* commit '83bf8d1673800954c8e7bb474a6a6b4519d33745':
2012-03-07 20:10:30 -08:00
Xavier Ducrohet
abcaa39070
am 624c4870: am 92b3b050: Add a prebuilt of the gridlayout support library. do not merge
...
* commit '624c487060ff8b20992a738bd8d6ff04ef247fa3':
2012-03-07 20:10:29 -08:00
Xavier Ducrohet
3a499b0fed
am 8438213c: am 88d97250: Prepare for doc package update in rev 2. do not merge.
...
* commit '8438213c2fc9aff20c3244dca5a1b30fadcb5785':
Prepare for doc package update in rev 2. do not merge.
2012-03-07 20:09:33 -08:00
Xavier Ducrohet
1754063ff0
am 198705d1: am 92b3b050: Add a prebuilt of the gridlayout support library. do not merge
...
* commit '198705d1ab7f818b146c0c6e0d85f80e4b658e06':
Add a prebuilt of the gridlayout support library. do not merge
2012-03-07 20:09:32 -08:00
Xavier Ducrohet
8438213c2f
am 88d97250: Prepare for doc package update in rev 2. do not merge.
...
* commit '88d972501ae16197ebabb2f053a69856bca410d9':
Prepare for doc package update in rev 2. do not merge.
2012-03-07 20:07:39 -08:00
Xavier Ducrohet
198705d1ab
am 92b3b050: Add a prebuilt of the gridlayout support library. do not merge
...
* commit '92b3b05096e23b7ce2b4b841044d518a379ada5d':
Add a prebuilt of the gridlayout support library. do not merge
2012-03-07 20:07:38 -08:00
Xavier Ducrohet
83bf8d1673
am 88d97250: Prepare for doc package update in rev 2. do not merge.
...
* commit '88d972501ae16197ebabb2f053a69856bca410d9':
Prepare for doc package update in rev 2. do not merge.
2012-03-07 20:07:09 -08:00
Xavier Ducrohet
624c487060
am 92b3b050: Add a prebuilt of the gridlayout support library. do not merge
...
* commit '92b3b05096e23b7ce2b4b841044d518a379ada5d':
Add a prebuilt of the gridlayout support library. do not merge
2012-03-07 20:07:08 -08:00
Xavier Ducrohet
88d972501a
Prepare for doc package update in rev 2. do not merge.
...
Change-Id: Ibd1e7b8cd25aed33f4f6abe86ed36ccf30d4c714
2012-03-07 17:52:21 -08:00
Xavier Ducrohet
92b3b05096
Add a prebuilt of the gridlayout support library. do not merge
...
Change-Id: Icd43238672a02f84e37d4301bec34dbe48375200
2012-03-07 17:47:12 -08:00
Jesse Hall
43a5b2b538
am 1beba231: Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/development into ics-scoop-plus-aosp
...
* commit '1beba23120a914aa02aa18569de0c06818bf5d09':
2012-03-07 17:22:11 -08:00
Jesse Hall
e6ab388b7d
am de9127c6: am cbd446a9: am 9322c5cb: Work around a y-invert bug on Macs w/ Intel GPU
...
* commit 'de9127c6b37bcc40c5d60a1b8b8588847ec986d1':
Work around a y-invert bug on Macs w/ Intel GPU
2012-03-07 17:22:10 -08:00
Jesse Hall
e4e4e59883
am 1d6ccdfa: am 1f4f50c7: am 767d0894: Delete dead code.
...
* commit '1d6ccdfacbecd977c038817b6cfff3a7f9e45c01':
Delete dead code.
2012-03-07 17:22:09 -08:00
Dirk Dougherty
722e3231fb
am 3c7dc0f4: am 3007c3f5: am 9ba4ba70: Doc change: string changes for Google Play
...
* commit '3c7dc0f4053abe5cdf8098d92f9beb22cc6f9bee':
2012-03-07 16:48:23 -08:00
Dirk Dougherty
1d7bba6b6f
resolved conflicts for merge of b7c3c566 to master
...
Change-Id: Ibd84692dc7f851b4389427ec2b504c4201e221b3
2012-03-07 16:44:43 -08:00
Raphael Moll
482423c8a9
Merge "SDK repo: fix to handle new and old xsd for support lib"
2012-03-07 15:04:14 -08:00
Jesse Hall
1beba23120
Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/development into ics-scoop-plus-aosp
2012-03-07 11:20:07 -08:00
Jesse Hall
de9127c6b3
am cbd446a9: am 9322c5cb: Work around a y-invert bug on Macs w/ Intel GPU
...
* commit 'cbd446a98ad24ca03a845dfa24cbe4db3f297147':
Work around a y-invert bug on Macs w/ Intel GPU
2012-03-07 11:19:59 -08:00
Jesse Hall
8b40621965
am ca2d0d1e: am 9322c5cb: Work around a y-invert bug on Macs w/ Intel GPU
...
* commit 'ca2d0d1e8d883d5b2ee0bd78a1dc95c54ce3c642':
Work around a y-invert bug on Macs w/ Intel GPU
2012-03-07 11:19:59 -08:00
Jesse Hall
1d6ccdfacb
am 1f4f50c7: am 767d0894: Delete dead code.
...
* commit '1f4f50c7d25cd9b95aec869aa57638703b44d4ec':
Delete dead code.
2012-03-07 11:19:58 -08:00
Jesse Hall
57a6651c5a
am f1ba5cf2: am 767d0894: Delete dead code.
...
* commit 'f1ba5cf21d7da576f80fdbbf6431a65fcd6a198f':
Delete dead code.
2012-03-07 11:19:58 -08:00
Jesse Hall
cbd446a98a
am 9322c5cb: Work around a y-invert bug on Macs w/ Intel GPU
...
* commit '9322c5cb2524c4f35408768ee3d1b8030f0360f9':
Work around a y-invert bug on Macs w/ Intel GPU
2012-03-07 11:17:46 -08:00
Jesse Hall
1f4f50c7d2
am 767d0894: Delete dead code.
...
* commit '767d08948790527e9df951a752703938ff517d30':
Delete dead code.
2012-03-07 11:17:45 -08:00
Jesse Hall
ca2d0d1e8d
am 9322c5cb: Work around a y-invert bug on Macs w/ Intel GPU
...
* commit '9322c5cb2524c4f35408768ee3d1b8030f0360f9':
Work around a y-invert bug on Macs w/ Intel GPU
2012-03-07 11:16:58 -08:00
Jesse Hall
f1ba5cf21d
am 767d0894: Delete dead code.
...
* commit '767d08948790527e9df951a752703938ff517d30':
Delete dead code.
2012-03-07 11:16:56 -08:00
Jesse Hall
9322c5cb25
Work around a y-invert bug on Macs w/ Intel GPU
...
On Macs running OS X 10.6 and 10.7 with Intel HD Graphics 3000, some
screens or parts of the screen are displayed upside down. The exact
conditions/sequence that triggers this aren't known yet; I haven't
been able to reproduce it in a standalone test. This also means I
don't know whether it is a driver bug, or a bug in the OpenglRender or
Translator code that just happens to work elsewhere.
Thanks to zhiyuan.li@intel.com for a patch this change is based on.
Change-Id: I04823773818d3b587a6951be48e70b03804b33d0
2012-03-07 10:06:57 -08:00
Jesse Hall
767d089487
Delete dead code.
...
Change-Id: I5b87fac4e2140a903221a1f68b16fa6a96e5effc
2012-03-07 10:06:37 -08:00
Jesse Hall
a308d5ff8e
Merge "Add/fix copyright notices"
2012-03-07 07:24:21 -08:00
Jesse Hall
8dfb93bc2b
Merge "Work around a y-invert bug on Macs w/ Intel GPU"
2012-03-06 18:14:24 -08:00
Jesse Hall
2dd25e2e9b
Merge "Delete dead code."
2012-03-06 18:14:08 -08:00
Jesse Hall
f4a20e58aa
Add/fix copyright notices
...
Several EmuGL files were missing copyright notices; added them. Others
had them but below other code, which makes checking for them more
difficult -- I moved these to the top of the file.
These files were all created by GraphTech as a work for hire for AOSP.
Change-Id: Iee67bcf1c9b54ad5aa8a9288ded0382a974c32cb
2012-03-06 16:13:03 -08:00
Jesse Hall
2478dfd351
Work around a y-invert bug on Macs w/ Intel GPU
...
On Macs running OS X 10.6 and 10.7 with Intel HD Graphics 3000, some
screens or parts of the screen are displayed upside down. The exact
conditions/sequence that triggers this aren't known yet; I haven't
been able to reproduce it in a standalone test. This also means I
don't know whether it is a driver bug, or a bug in the OpenglRender or
Translator code that just happens to work elsewhere.
Thanks to zhiyuan.li@intel.com for a patch this change is based on.
Change-Id: I04823773818d3b587a6951be48e70b03804b33d0
2012-03-06 16:09:06 -08:00
Jesse Hall
54934b06f1
Delete dead code.
...
Change-Id: I5b87fac4e2140a903221a1f68b16fa6a96e5effc
2012-03-06 16:09:06 -08:00
Xavier Ducrohet
1330a44b49
Merge "Add the new v7 support library project to the SDK."
2012-03-06 15:25:40 -08:00
Xavier Ducrohet
7942a69488
Add the new v7 support library project to the SDK.
...
Change-Id: If9078f71e369bae3dd4a0e89ddd792bbfef09fbb
2012-03-06 15:14:05 -08:00
Dirk Dougherty
3c7dc0f405
am 3007c3f5: am 9ba4ba70: Doc change: string changes for Google Play
...
* commit '3007c3f529e427dd1a4b0b5d1eaaa5b694938777':
2012-03-05 21:40:31 -08:00
Dirk Dougherty
b7c3c566f3
am 8d74e4be: am 9ba4ba70: Doc change: string changes for Google Play
...
* commit '8d74e4bec1bcacbaf14e61fc58680393233bc663':
Doc change: string changes for Google Play
2012-03-05 21:39:42 -08:00
Dirk Dougherty
8d74e4bec1
am 9ba4ba70: Doc change: string changes for Google Play
...
* commit '9ba4ba709459ce07161fc683459ae4b4005ed791':
Doc change: string changes for Google Play
2012-03-05 21:37:41 -08:00
Dirk Dougherty
3007c3f529
am 9ba4ba70: Doc change: string changes for Google Play
...
* commit '9ba4ba709459ce07161fc683459ae4b4005ed791':
Doc change: string changes for Google Play
2012-03-05 21:37:17 -08:00
Shih-wei Liao
eb2a72d963
Merge "Rename resource drawable to drawable-nodpi for RsStates."
2012-03-05 10:37:38 -08:00
Bill Napier
339fa32291
Merge "Fix UNKNOWN keycode parsing in monkey."
2012-03-05 09:49:27 -08:00
Shih-wei Liao
d3ed0458e4
Rename resource drawable to drawable-nodpi for RsStates.
...
Otherwise, we'll have the power of 2 cube faces problem.
The issue was first reported by yong.a.chen@intel.com .
Change-Id: I1b2fa9d261e42b2f962ea29f690d5624a883574c
2012-03-05 08:38:01 -08:00
Dirk Dougherty
9ba4ba7094
Doc change: string changes for Google Play
...
Change-Id: I39acdc4faae23a43d39c2e2976543a946bd656af
2012-03-04 20:54:23 -08:00
Nick Kralevich
c622a9dd84
Merge "remove HAL_MODULE_INFO_SYM const"
2012-03-02 08:29:36 -08:00
Nick Kralevich
c7f0d89684
remove HAL_MODULE_INFO_SYM const
...
HAL_MODULE_INFO_SYM was declared as read-only, but
the struct is written to by libhardware. This causes
a segfault when -Wl,-z,relro is enabled.
Fixed.
Change-Id: I3a3e8366bc2468aef75a3480edd0b3e8fcfeafa5
2012-03-01 17:06:37 -08:00