LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,955 Commits 2 Branches 0 Tags
773c80fdb1143eb22c2712cf654fa88d8d37510c
Commit Graph

5955 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Baptiste Queru
02fe35d64f am c969a03b: merge from open-source master 
* commit 'c969a03b5e5f6754adf45edd98ed1a10c42bf641':
  Fix device builds
 2011-03-31 09:23:33 -07:00
Jean-Baptiste Queru
c969a03b5e merge from open-source master 
Change-Id: I1f2a4650c696c6a58d59b8fd6e96dc3a372ff095
 2011-03-31 09:19:11 -07:00
David 'Digit' Turner
a8725e817a Merge "Fix device builds" 2011-03-31 08:33:40 -07:00
David 'Digit' Turner
e97b54b648 Fix device builds 
This patch ensures that the egl.cfg file specific to our
hardware OpenGL emulation is only copied to the system images
of emulator-specific build products.

This fixes a conflict for device-specific products (which provide
their own hw-specific egl.cfg).

Change-Id: I30cd64ba5915e5ffdc1091de8db20f6c3c671486
 2011-03-31 09:39:59 +02:00
Winson Chung
5892ebcdd9 am 6c6639d1: am b02ad50d: Making the sample weather widget vertically resizeable. 
* commit '6c6639d1e25c041800228d1c961279b1451ed2aa':
  Making the sample weather widget vertically resizeable.
 2011-03-30 16:38:41 -07:00
David 'Digit' Turner
8243e7b4fc am e61f64b3: am 7b14e7c0: am a5d35801: am 50dd0170: Merge "Fix linux sdk build." 
* commit 'e61f64b332911ba6830959d3d1b59620b1b85dc5':
  Fix linux sdk build.
 2011-03-30 16:36:32 -07:00
David Turner
37ef2afc48 am 720ec5ef: am ee8e31ad: am 02c8a712: am 4bda89b6: Merge changes I6379d6b1,I77794044 
* commit '720ec5efca302e63b78a6dafaebe97c3abba456a':
  Android emulator opengl - host side EGL wrapper
  Android emulator opengl - unit test host side renderer
 2011-03-30 16:36:30 -07:00
David Turner
accc143f6a am 5a1237f5: am 420e1b0d: am d5df4a71: am 485970b9: Merge "Android emulator opengles - unit test gles wrapper" 
* commit '5a1237f519169b81e4cf5ab21143506a297b22e1':
  Android emulator opengles - unit test gles wrapper
 2011-03-30 16:36:26 -07:00
David Turner
d9abb30968 am af2d828a: am 98c75d03: am 0aa24748: am 3f22fdc0: Merge "Android emulator opengl - unit testing render control api" 
* commit 'af2d828a8b319902e0317f9965fb86c577d7843f':
  Android emulator opengl - unit testing render control api
 2011-03-30 16:35:45 -07:00
David Turner
9a74f8e7f3 am 61dd0b82: am e347712d: am 06bf2701: am 02ef4e99: Merge "Android emulator opengl - OpenGL ES 1.1 decoder" 
* commit '61dd0b82511cc2000799835d6cdebdcd0769b453':
  Android emulator opengl - OpenGL ES 1.1 decoder
 2011-03-30 16:35:39 -07:00
David Turner
03c0ab6771 am a3137783: am 2e5f0d15: am 8a882514: am 39c9911c: Merge "Emulator opengl - Opengl ES 1.1 encoder" 
* commit 'a3137783dcbe06bb4da04a722c727eb361851aa8':
  Emulator opengl - Opengl ES 1.1 encoder
 2011-03-30 16:34:50 -07:00
David Turner
8eae16f9ba am e9f8263d: am 483ff042: am 687d8b76: am 98015723: Merge "Opengl implementation - codec common code" 
* commit 'e9f8263d2a516ef56917a21fe90382cefbca6f38':
  Opengl implementation - codec common code
 2011-03-30 16:34:46 -07:00
David Turner
5a4f0c40d4 am d56f61b3: am 201398b4: am 85d6342d: am 99d6295f: Merge "Enable lcd backlight in the emulator." 
* commit 'd56f61b3fdd02cb4483a759e240180bac1dd23aa':
  Enable lcd backlight in the emulator.
 2011-03-30 16:34:30 -07:00
Raphael
de3c6fdf34 am ee13f1c3: am 06f2189a: am 627afeae: resolved conflicts for merge of 002acfc3 to stage-korg-master 
* commit 'ee13f1c3a7ca2eb47031d7c5bfabc3babd3e513a':
  Fix XMLNS detection in SDK Repo XSD files.
 2011-03-30 16:34:26 -07:00
David 'Digit' Turner
d6174475af am 74a30541: am 1ca79b34: am 8edebe1f: am 4712e4eb: Merge "qemud: disable debug traces" 
* commit '74a30541a481ce598b61c2c3665020207c6351bd':
  qemud: disable debug traces
 2011-03-30 16:34:17 -07:00
Raphael
21470619d6 am 89c0b1a3: (-s ours) am 7a8e0399: (-s ours) am 86f738ab: am 473fad03: (-s ours) Merge "Merge 48023786cf: \'Generate SDK Repository XML.\' Do not merge." 
* commit '89c0b1a34e968b4525ed8fed0a8cf09f1184d08e':
  Merge 48023786cf: 'Generate SDK Repository XML.' Do not merge.
 2011-03-30 16:34:13 -07:00
Raphael
f922f6d124 am 84ed1107: (-s ours) am 8ad74177: (-s ours) am 2a610080: am 878796e9: (-s ours) Merge "Merge 2ff496b8a1: \'Build SDK repository.\' Do not merge." 
* commit '84ed11075eed81f4e2525319010793881ff16dd9':
  Merge 2ff496b8a1: 'Build SDK repository.' Do not merge.
 2011-03-30 16:34:07 -07:00
Winson Chung
6c6639d1e2 am b02ad50d: Making the sample weather widget vertically resizeable. 
* commit 'b02ad50d1a83f7171aaa1c1d17716ed5699dec40':
  Making the sample weather widget vertically resizeable.
 2011-03-30 09:37:06 -07:00
David 'Digit' Turner
e61f64b332 am 7b14e7c0: am a5d35801: am 50dd0170: Merge "Fix linux sdk build." 
* commit '7b14e7c051eabf2f9b3e2f8035d8330a4924d930':
  Fix linux sdk build.
 2011-03-30 08:21:25 -07:00
David Turner
720ec5efca am ee8e31ad: am 02c8a712: am 4bda89b6: Merge changes I6379d6b1,I77794044 
* commit 'ee8e31ad5229634770ecd6eb5c3a52ff03284c17':
  Android emulator opengl - host side EGL wrapper
  Android emulator opengl - unit test host side renderer
 2011-03-30 08:21:20 -07:00
David Turner
5a1237f519 am 420e1b0d: am d5df4a71: am 485970b9: Merge "Android emulator opengles - unit test gles wrapper" 
* commit '420e1b0dd42e645bf1b928f3fb9d13a0560e366f':
  Android emulator opengles - unit test gles wrapper
 2011-03-30 08:21:15 -07:00
David Turner
af2d828a8b am 98c75d03: am 0aa24748: am 3f22fdc0: Merge "Android emulator opengl - unit testing render control api" 
* commit '98c75d03495e55c756db5d76218467f355eb8193':
  Android emulator opengl - unit testing render control api
 2011-03-30 08:21:13 -07:00
David Turner
61dd0b8251 am e347712d: am 06bf2701: am 02ef4e99: Merge "Android emulator opengl - OpenGL ES 1.1 decoder" 
* commit 'e347712dace1e1924e319bc4a6a89796dd7a4cb2':
  Android emulator opengl - OpenGL ES 1.1 decoder
 2011-03-30 08:21:10 -07:00
David Turner
a3137783dc am 2e5f0d15: am 8a882514: am 39c9911c: Merge "Emulator opengl - Opengl ES 1.1 encoder" 
* commit '2e5f0d15fbb875e67845503427a8ee204261ca5b':
  Emulator opengl - Opengl ES 1.1 encoder
 2011-03-30 08:21:07 -07:00
David Turner
e9f8263d2a am 483ff042: am 687d8b76: am 98015723: Merge "Opengl implementation - codec common code" 
* commit '483ff04245c6f6739663fa9357f75d6900bc5259':
  Opengl implementation - codec common code
 2011-03-30 08:21:04 -07:00
David Turner
d56f61b3fd am 201398b4: am 85d6342d: am 99d6295f: Merge "Enable lcd backlight in the emulator." 
* commit '201398b4890f37e2a0db4ef33dfc2140506a4957':
  Enable lcd backlight in the emulator.
 2011-03-30 08:20:36 -07:00
Raphael
ee13f1c3a7 am 06f2189a: am 627afeae: resolved conflicts for merge of 002acfc3 to stage-korg-master 
* commit '06f2189a4eb7221ae5ef0eda451f4f7875b906b5':
  Fix XMLNS detection in SDK Repo XSD files.
 2011-03-30 08:20:33 -07:00
David 'Digit' Turner
74a30541a4 am 1ca79b34: am 8edebe1f: am 4712e4eb: Merge "qemud: disable debug traces" 
* commit '1ca79b3497eb4ca3f7341dcb97bb263d8fa6245b':
  qemud: disable debug traces
 2011-03-30 08:20:18 -07:00
Raphael
89c0b1a34e am 7a8e0399: (-s ours) am 86f738ab: am 473fad03: (-s ours) Merge "Merge 48023786cf: \'Generate SDK Repository XML.\' Do not merge." 
* commit '7a8e0399c6b8b0b02cd596d0949acc8364500887':
  Merge 48023786cf: 'Generate SDK Repository XML.' Do not merge.
 2011-03-30 08:20:01 -07:00
Raphael
84ed11075e am 8ad74177: (-s ours) am 2a610080: am 878796e9: (-s ours) Merge "Merge 2ff496b8a1: \'Build SDK repository.\' Do not merge." 
* commit '8ad7417748be9a2a1456f55d1e5e4c6484c06f93':
  Merge 2ff496b8a1: 'Build SDK repository.' Do not merge.
 2011-03-30 08:19:56 -07:00
David 'Digit' Turner
7b14e7c051 am a5d35801: am 50dd0170: Merge "Fix linux sdk build." 
* commit 'a5d358011e16abdc29ac600a40d96e5b5d59cd7a':
  Fix linux sdk build.
 2011-03-29 09:57:16 -07:00
David 'Digit' Turner
a5d358011e am 50dd0170: Merge "Fix linux sdk build." 
* commit '50dd0170660e4ef98ec3eb470eb6ce053d2b9825':
  Fix linux sdk build.
 2011-03-29 09:55:00 -07:00
Kenny Root
c8c211a085 Fix some errors in the foreground compat 
The foreground compatibility sample wouldn't actually work on an old
platform because of a misplaced return statement in onCreate and the
invokeMethod would ignore its arguments.

Change-Id: Ic1d1a6d8579700215c7988cd603a6bb86f1346a4
 2011-03-29 09:51:21 -07:00
David 'Digit' Turner
50dd017066 Merge "Fix linux sdk build." 2011-03-29 09:39:59 -07:00
David 'Digit' Turner
db35d9a010 Fix linux sdk build. 
This is a temporary patch until we update the prebuilt/ tree accordingly
to include libxcb.so for Linux.

Change-Id: I76d9966bfb73bf3f5ca35cc30f6e12fb262dc2b2
 2011-03-29 18:37:37 +02:00
Xavier Ducrohet
e5a81ca2f5 am f19518fc: am 9775ffe5: Merge "Update SDK files to API 12/Android 3.1" into honeycomb-mr1 
* commit 'f19518fcb1ef26db56094cfaaf9d8082ad30f316':
  Update SDK files to API 12/Android 3.1
 2011-03-28 16:03:32 -07:00
Xavier Ducrohet
f19518fcb1 am 9775ffe5: Merge "Update SDK files to API 12/Android 3.1" into honeycomb-mr1 
* commit '9775ffe5fd3b8498137edf59c7570c4639a73763':
  Update SDK files to API 12/Android 3.1
 2011-03-28 15:58:37 -07:00
Winson Chung
b02ad50d1a Making the sample weather widget vertically resizeable. 
Change-Id: I0301004a703b501cf135e0750512ad9070aff59c
 2011-03-28 15:46:29 -07:00
Xavier Ducrohet
9775ffe5fd Merge "Update SDK files to API 12/Android 3.1" into honeycomb-mr1 2011-03-28 15:27:26 -07:00
Xavier Ducrohet
a6f8392dc7 Update SDK files to API 12/Android 3.1 
Change-Id: I630413dab4f6859623a9c1aa44b54abe6ef392b8
 2011-03-28 15:23:37 -07:00
David Turner
ee8e31ad52 am 02c8a712: am 4bda89b6: Merge changes I6379d6b1,I77794044 
* commit '02c8a7121ff33b44dc7d7581eb67faae59ee3d2c':
  Android emulator opengl - host side EGL wrapper
  Android emulator opengl - unit test host side renderer
 2011-03-28 13:16:42 -07:00
David Turner
420e1b0dd4 am d5df4a71: am 485970b9: Merge "Android emulator opengles - unit test gles wrapper" 
* commit 'd5df4a71c659f6ca450be596dda87150dd44b6a3':
  Android emulator opengles - unit test gles wrapper
 2011-03-28 13:16:40 -07:00
David Turner
98c75d0349 am 0aa24748: am 3f22fdc0: Merge "Android emulator opengl - unit testing render control api" 
* commit '0aa24748348e5e830f0a069b5f44d90444ce1709':
  Android emulator opengl - unit testing render control api
 2011-03-28 13:16:38 -07:00
David Turner
e347712dac am 06bf2701: am 02ef4e99: Merge "Android emulator opengl - OpenGL ES 1.1 decoder" 
* commit '06bf2701348c253876876bcba1229fa3afe85658':
  Android emulator opengl - OpenGL ES 1.1 decoder
 2011-03-28 13:16:36 -07:00
David Turner
02c8a7121f am 4bda89b6: Merge changes I6379d6b1,I77794044 
* commit '4bda89b6df7f31e9ea80e40e1aa23b6a80eafdd5':
  Android emulator opengl - host side EGL wrapper
  Android emulator opengl - unit test host side renderer
 2011-03-28 13:14:41 -07:00
David Turner
d5df4a71c6 am 485970b9: Merge "Android emulator opengles - unit test gles wrapper" 
* commit '485970b99f550602e0296658ea15849a2e857d96':
  Android emulator opengles - unit test gles wrapper
 2011-03-28 13:14:39 -07:00
David Turner
0aa2474834 am 3f22fdc0: Merge "Android emulator opengl - unit testing render control api" 
* commit '3f22fdc0faeb35ad6b7476f87938e7b2554a2255':
  Android emulator opengl - unit testing render control api
 2011-03-28 13:14:37 -07:00
David Turner
06bf270134 am 02ef4e99: Merge "Android emulator opengl - OpenGL ES 1.1 decoder" 
* commit '02ef4e99572bd67d83332168f355c49bb6d4aba7':
  Android emulator opengl - OpenGL ES 1.1 decoder
 2011-03-28 13:14:35 -07:00
David Turner
4bda89b6df Merge changes I6379d6b1,I77794044 
* changes:
  Android emulator opengl - host side EGL wrapper
  Android emulator opengl - unit test host side renderer
 2011-03-28 13:12:14 -07:00
David Turner
2e5f0d15fb am 8a882514: am 39c9911c: Merge "Emulator opengl - Opengl ES 1.1 encoder" 
* commit '8a8825144a518296afa33a1e41295bad729d3431':
  Emulator opengl - Opengl ES 1.1 encoder
 2011-03-28 13:08:43 -07:00