Xavier Ducrohet
5b67110a7c
am ed708223: am 7748c429: Updated revision for the compatibility library.
...
* commit 'ed7082230109e2592e6a3f87d733505bdb95abb7':
Updated revision for the compatibility library.
2011-05-18 17:04:21 -07:00
Xavier Ducrohet
ed70822301
am 7748c429: Updated revision for the compatibility library.
...
* commit '7748c429c95cb88ac943fb2843d7834974696454':
Updated revision for the compatibility library.
2011-05-18 17:01:57 -07:00
Robert Greenwalt
4a76d154e4
am 82cdc8cc: Merge "Fix Development app to use netd for routes" into honeycomb-LTE
...
* commit '82cdc8cc426fa73b49412245b1c826d4acd29140':
Fix Development app to use netd for routes
2011-05-18 16:31:01 -07:00
Robert Greenwalt
82cdc8cc42
Merge "Fix Development app to use netd for routes" into honeycomb-LTE
2011-05-18 15:29:42 -07:00
Xavier Ducrohet
7748c429c9
Updated revision for the compatibility library.
...
Change-Id: I217fd11dc2458490e6981e9f614ce5770ba329c1
2011-05-18 13:36:36 -07:00
David Turner
d143387d72
am 1c53e616: am fd6ed4dd: Merge "adding functionality to get the local name of an object from it\'s local name"
...
* commit '1c53e61689094f088a07b6fb3cb634eda1833f05':
adding functionality to get the local name of an object from it's local name
2011-05-18 07:42:00 -07:00
David Turner
1c53e61689
am fd6ed4dd: Merge "adding functionality to get the local name of an object from it\'s local name"
...
* commit 'fd6ed4dd3167517c926b0af4fdc183d7f015b9fe':
adding functionality to get the local name of an object from it's local name
2011-05-18 07:29:33 -07:00
David Turner
fd6ed4dd31
Merge "adding functionality to get the local name of an object from it's local name"
2011-05-18 06:52:22 -07:00
David Turner
a76ded7112
am 7e026547: am 83b55247: Merge "this checkin supports windows OS in all Translator libs"
...
* commit '7e0265477a936ff562dc8cab84a3b24bde267799':
this checkin supports windows OS in all Translator libs
2011-05-18 03:22:51 -07:00
David Turner
7e0265477a
am 83b55247: Merge "this checkin supports windows OS in all Translator libs"
...
* commit '83b552470ee9d1d5bd51cd531b00b35cbeb7b289':
this checkin supports windows OS in all Translator libs
2011-05-18 03:15:52 -07:00
David Turner
83b552470e
Merge "this checkin supports windows OS in all Translator libs"
2011-05-18 02:33:59 -07:00
Amit Feller
f0b7c2e4f9
this checkin supports windows OS in all Translator libs
...
Note: this is a re-submit of Ie5111d9c435b64d205b140a79863c0273742ee7f,
fixed to avoid breaking the Mac build.
Change-Id: Ib534063d3f403d33d162956bf510baf9689a246a
2011-05-17 21:28:17 +02:00
David 'Digit' Turner
8fc94823cf
am 42a6c754: am 3a38c110: Merge "Fix mac build"
...
* commit '42a6c75463a3b4590dbc9a3483222f3478342367':
Fix mac build
2011-05-17 12:21:29 -07:00
David 'Digit' Turner
42a6c75463
am 3a38c110: Merge "Fix mac build"
...
* commit '3a38c110a970c443c09df6a529a78f5b02a870dc':
Fix mac build
2011-05-17 12:18:07 -07:00
Raphael Moll
08382e1e2c
am ed78d63d: am 3fe7791c: Merge "Revert "this checkin supports windows OS in all Translator libs""
...
* commit 'ed78d63de23730be2a85b7a55b5646b7dc4b7057':
Revert "this checkin supports windows OS in all Translator libs"
2011-05-17 12:11:42 -07:00
Raphael Moll
ed78d63de2
am 3fe7791c: Merge "Revert "this checkin supports windows OS in all Translator libs""
...
* commit '3fe7791ca18012b69f4663bf69901dd302f2d87f':
Revert "this checkin supports windows OS in all Translator libs"
2011-05-17 12:09:24 -07:00
David 'Digit' Turner
3a38c110a9
Merge "Fix mac build"
2011-05-17 12:01:39 -07:00
David 'Digit' Turner
2840185690
Fix mac build
...
Change-Id: I1fc8c5043160dbe2508324655fb506bc31cc50ac
2011-05-17 21:00:52 +02:00
Raphael Moll
3fe7791ca1
Merge "Revert "this checkin supports windows OS in all Translator libs""
2011-05-17 11:54:40 -07:00
Raphael Moll
603b37abac
Revert "this checkin supports windows OS in all Translator libs"
...
This reverts commit 0bf6848571 .
This commit breaks Mca builds:
development/tools/emulator/opengl/host/libs/Translator/EGL/EglImp.cpp: In function 'EGLBoolean eglChooseConfig(void*, const EGLint*, void**, EGLint, EGLint*)':
development/tools/emulator/opengl/host/libs/Translator/EGL/EglImp.cpp:412: error: 'PIXEL_FORMAT_INITIALIZER' was not declared in this scope
make: *** [out/host/darwin-x86/obj/SHARED_LIBRARIES/libEGL_translator_intermediates/EglImp.o] Error 1
2011-05-17 11:41:30 -07:00
David Turner
c8e4598a5e
am 97d1ddc6: am 4e79d11a: Merge " fixing bug in the name of GL function "glClearDepthf" --> "glClearDeapth""
...
* commit '97d1ddc632df673693b570bcb8f8fa99b5b9b6da':
fixing bug in the name of GL function "glClearDepthf" --> "glClearDeapth"
2011-05-17 06:19:57 -07:00
David Turner
97d1ddc632
am 4e79d11a: Merge " fixing bug in the name of GL function "glClearDepthf" --> "glClearDeapth""
...
* commit '4e79d11a66e73052c6d06de5a99da022b0eb7335':
fixing bug in the name of GL function "glClearDepthf" --> "glClearDeapth"
2011-05-17 06:17:24 -07:00
Amit Feller
1f4c692222
adding functionality to get the local name of an object from it's local name
...
Change-Id: I8c9ccc36a5fb70a38a77fa0f0e7826a6fe886db1
2011-05-17 16:10:27 +03:00
David Turner
4e79d11a66
Merge " fixing bug in the name of GL function "glClearDepthf" --> "glClearDeapth""
2011-05-17 06:03:36 -07:00
Amit Feller
02c3e538e8
fixing bug in the name of GL function "glClearDepthf" --> "glClearDeapth"
...
Change-Id: I9700bdb973d2dc01400078c349010a271004dbd9
2011-05-17 15:33:43 +03:00
David Turner
df0c8dbf3d
am ce5934c3: am 89bccc8b: Merge "this checkin supports windows OS in all Translator libs"
...
* commit 'ce5934c3a025d656a7c268e15b766b0b8f20af53':
this checkin supports windows OS in all Translator libs
2011-05-17 04:45:07 -07:00
David Turner
ce5934c3a0
am 89bccc8b: Merge "this checkin supports windows OS in all Translator libs"
...
* commit '89bccc8bd926a4f66b059e292aadb1281b119db3':
this checkin supports windows OS in all Translator libs
2011-05-17 04:23:22 -07:00
David Turner
89bccc8bd9
Merge "this checkin supports windows OS in all Translator libs"
2011-05-17 03:45:09 -07:00
Amit Feller
0bf6848571
this checkin supports windows OS in all Translator libs
...
Change-Id: Ie5111d9c435b64d205b140a79863c0273742ee7f
2011-05-17 11:20:25 +03:00
Robert Greenwalt
b925721fdf
Fix Development app to use netd for routes
...
Change-Id: I668d7165821071850a9b6011bc32eba1682e59ac
2011-05-16 10:26:16 -07:00
David Turner
d30ae48ee4
am 41709da8: am b5f5dce4: Merge " small changes to the code before the commit for supporting windows os"
...
* commit '41709da80e95e94d9f533a18b11c646f56cebfba':
small changes to the code before the commit for supporting windows os
2011-05-16 07:34:01 -07:00
David Turner
225830effb
am 7ff51735: am 92c079df: Merge "changing GLcommon lib to be a sharedlib instead of static"
...
* commit '7ff51735737bae34b0fe2b7e326a4843fde3b115':
changing GLcommon lib to be a sharedlib instead of static
2011-05-16 07:33:54 -07:00
David Turner
41709da80e
am b5f5dce4: Merge " small changes to the code before the commit for supporting windows os"
...
* commit 'b5f5dce4c722e797d9acbfaea24123dfbc58a82b':
small changes to the code before the commit for supporting windows os
2011-05-16 07:15:39 -07:00
David Turner
7ff5173573
am 92c079df: Merge "changing GLcommon lib to be a sharedlib instead of static"
...
* commit '92c079dfd65b254ffbfa33060297170e6bbcd93a':
changing GLcommon lib to be a sharedlib instead of static
2011-05-16 07:15:36 -07:00
David Turner
b5f5dce4c7
Merge " small changes to the code before the commit for supporting windows os"
2011-05-16 06:43:58 -07:00
David Turner
92c079dfd6
Merge "changing GLcommon lib to be a sharedlib instead of static"
2011-05-16 06:40:07 -07:00
Dianne Hackborn
8486cba691
am d9012d1b: DO NOT MERGE. Integrate API demo work from master.
...
* commit 'd9012d1bfa132969fb8fed737e2f9f19eefbc0b5':
DO NOT MERGE. Integrate API demo work from master.
2011-05-13 15:45:34 -07:00
Dianne Hackborn
d9012d1bfa
DO NOT MERGE. Integrate API demo work from master.
...
New API demo for the support library FragmentPager class.
Add API demo for new -wNNNdp and -hNNNdp configs.
Add new API demo for implementing a custom loader.
Also turn the fragment cursor list demo into a loader cursor demo.
2011-05-13 13:31:52 -07:00
Jean-Baptiste Queru
39e63e526a
Merge 6a79f798
...
Change-Id: I1bb91242b2fb7651ba0505c416d7559d50259472
2011-05-12 16:28:47 -07:00
Jean-Baptiste Queru
6a79f79832
am 3ef19fa9: Merge "test_defs: new CTS security test." into gingerbread
...
* commit '3ef19fa91771be93f398af577a4432bb0fd571aa':
test_defs: new CTS security test.
2011-05-12 16:20:21 -07:00
Jean-Baptiste Queru
3ef19fa917
Merge "test_defs: new CTS security test." into gingerbread
2011-05-12 15:56:22 -07:00
Amit Feller
6203540306
small changes to the code before the commit for supporting windows os
...
Change-Id: I062add6d6340677a9e2e98ac47d53c87ad2a6535
2011-05-11 17:48:21 +03:00
Amit Feller
e387c21109
changing GLcommon lib to be a sharedlib instead of static
...
Change-Id: Ic1fdcd1fbf3105a6fbd26c77e58acbe9b09dcacb
2011-05-11 17:31:02 +03:00
David 'Digit' Turner
265327f06c
am d1ac6bdc: Merge "emulator: opengl: ut_renderer usability improvements"
...
* commit 'd1ac6bdc3b3b4c2fe788d8b8f7886ac625cb1559':
emulator: opengl: ut_renderer usability improvements
2011-05-10 17:19:04 -07:00
David 'Digit' Turner
d1ac6bdc3b
Merge "emulator: opengl: ut_renderer usability improvements"
2011-05-09 02:45:28 -07:00
David 'Digit' Turner
91f40d930e
emulator: opengl: ut_renderer usability improvements
...
This patch provides two useful changes to the ut_renderer
unit-test program:
1/ the ability to control the GL window dimensions with
two env. variables: ANDROID_WINDOW_WIDTH and ANDROID_WINDOW_HEIGHT
2/ the ability to save/restore the GL window position between
GL connections.
Both are useful to use ut_renderer in a demo setting, nothing more.
Change-Id: I19a8f911ee821ddc4eb6307de12d63600ff696b0
2011-05-05 22:42:31 +02:00
Mike Lockwood
04b53db9b4
am cd392822: Add USB MissleLauncher sample program
...
* commit 'cd39282253ec8a27eae1d580fbaa91a8f3c7c5ff':
Add USB MissleLauncher sample program
2011-05-03 15:22:17 -07:00
Mike Lockwood
95dfe36725
am 3385faf4: Add AdbTest sample program
...
* commit '3385faf4e60e1ac4f4cf387702ef3be211374ef2':
Add AdbTest sample program
2011-05-03 15:22:14 -07:00
Mike Lockwood
cd39282253
Add USB MissleLauncher sample program
...
This is sample code that controls a USB missle launcher using USB host APIs
Change-Id: Ic4201faccc4562bf114c70d50b0cab6a00d28a98
Signed-off-by: Mike Lockwood <lockwood@android.com >
2011-05-03 17:56:51 -04:00
Mike Lockwood
3385faf4e6
Add AdbTest sample program
...
This sample implements the "adb logcat" command using USB host APIs.
Change-Id: Ifbf122e99358bd3a1cd2a7967c364ffd59f003b3
Signed-off-by: Mike Lockwood <lockwood@android.com >
2011-05-03 17:55:19 -04:00