aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* merge in jb-release history after reset to masterThe Android Automerger2012-03-260-0/+0
|\
| * merge in jb-release history after reset to masterThe Android Automerger2012-03-210-0/+0
| |\
| | * merge in jb-release history after reset to masterThe Android Automerger2012-03-200-0/+0
| | |\
| | | * merge in jb-release history after reset to masterThe Android Automerger2012-03-200-0/+0
| | | |\ | | | |/ | | |/|
| | * | merge in jb-release history after reset to masterThe Android Automerger2012-03-190-0/+0
| | |\ \
| | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-03-150-0/+0
| | | |\ \
| | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-03-120-0/+0
| | | | |\ \
| | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-03-060-0/+0
| | | | | |\ \
| | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-03-050-0/+0
| | | | | | |\ \
| | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-02-290-0/+0
| | | | | | | |\ \
| | | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-02-270-0/+0
| | | | | | | | |\ \
| | | | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-02-230-0/+0
| | | | | | | | | |\ \
| | | | | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-02-140-0/+0
| | | | | | | | | | |\ \
| | | | | | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-02-130-0/+0
| | | | | | | | | | | |\ \
| | | | | | | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-02-060-0/+0
| | | | | | | | | | | | |\ \
| | | | | | | | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-02-020-0/+0
| | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-01-310-0/+0
| | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | * \ merge in jb-release history after reset to masterThe Android Automerger2012-01-300-0/+0
| | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | * \ merge in ics-release history after reset to masterThe Android Automerger2012-01-250-0/+0
| | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | * \ merge in ics-release history after reset to masterThe Android Automerger2012-01-240-0/+0
| | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | * \ merge in ics-release history after reset to masterThe Android Automerger2012-01-230-0/+0
| | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | * \ merge in ics-release history after reset to masterThe Android Automerger2012-01-180-0/+0
| | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | * \ merge in ics-release history after reset to masterThe Android Automerger2012-01-170-0/+0
| | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | * \ merge in ics-release history after reset to masterThe Android Automerger2012-01-120-0/+0
| | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | * \ merge in ics-release history after reset to masterThe Android Automerger2012-01-110-0/+0
| | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | * \ merge in ics-release history after reset to masterThe Android Automerger2012-01-100-0/+0
| | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | * \ merge in ics-release history after reset to masterThe Android Automerger2012-01-090-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in ics-release history after reset to masterThe Android Automerger2012-01-050-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in ics-release history after reset to masterThe Android Automerger2011-12-220-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in ics-release history after reset to masterThe Android Automerger2011-12-190-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in ics-release history after reset to masterThe Android Automerger2011-12-140-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in ics-release history after reset to masterThe Android Automerger2011-12-120-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in ics-release history after reset to masterThe Android Automerger2011-12-080-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in ics-release history after reset to masterThe Android Automerger2011-11-280-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in ics-release history after reset to masterThe Android Automerger2011-11-160-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in ics-release history after reset to masterThe Android Automerger2011-11-100-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in ics-release history after reset to masterThe Android Automerger2011-11-090-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in ics-release history after reset to masterThe Android Automerger2011-10-250-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | \ \ Merge "Get rid of compiler warnings."Vladimir Chtchetkine2012-03-231-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Get rid of compiler warnings.Vladimir Chtchetkine2012-03-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compiler throws warnings that 'dhport/dlport' may be used uninitialized, which creates a lot of noise when compiling the emulator. The way the variables are used and initialized makes it completely safe to ignore these warnings. Change-Id: I87c9930c73bb8d54a86e826ca23b32010fbc046f
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-enable Linux 64-bit emulatorAndrew Hsieh2012-03-233-13/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore rules in Makefiles for Linux 64-bit emulator, now that all the dependencies are merged (toolchain, lib64*.{a,so}, etc) Change-Id: I25ecc53837ad9f10ceafb89d9e1d7a3124ce2d71
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "New option '-force-32bit' to always use 32-bit emulator on 64-bit ↵Andrew Hsieh2012-03-223-15/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | platforms"
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New option '-force-32bit' to always use 32-bit emulator on 64-bit platformsAndrew Hsieh2012-03-223-15/+33
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Useful for both QA and trouble-shooting Change-Id: I09eac8b94e29e8a201188bf17d3511c15cfee4b4
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Revert "EmuGL: Add OnPost callback to OpenGL renderer""Jesse Hall2012-03-223-13/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "EmuGL: Add OnPost callback to OpenGL renderer"Jesse Hall2012-03-223-13/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 2f4361f1d63751f1f72e1a1f953acfb9c05727da
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "EmuGL: Add OnPost callback to OpenGL renderer"Jesse Hall2012-03-223-6/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EmuGL: Add OnPost callback to OpenGL rendererJesse Hall2012-03-223-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Match the interface changes in the OpenGL renderer that add a per-frame callback. The callback isn't used in this change. This change is co-dependent on Idae3b026d52ed8dd666cbcdc3f3af80175c90ad3 in development/. Change-Id: Idae3b026d52ed8dd666cbcdc3f3af80175c90ad3
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use enum where appropriate in hw.iniVladimir Chtchetkine2012-03-211-3/+8
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8a85de939a89d373724cfb977141ca01e7d1ff34
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add 'enum' entry type to hw.ini fileVladimir Chtchetkine2012-03-211-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'entry' type enumerates values that are allowed for the given type name. Change-Id: Ic0f4021f761dfd78ff4dd9d2b58a2d811109b3c6
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Support 'enum' type in hardware-properties.ini file"Vladimir Chtchetkine2012-03-211-60/+3
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 1d57949ea5bae66b27febc2edcfc7ae0f10be716