aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 9c676ef4: Merge "Match language-specific flags before default locale ↵Tor Norbye2014-09-021-11/+12
|\ | | | | | | | | | | | | country matches" into idea133 automerge: 1687a96 * commit '9c676ef418fcfc933a07d6e1ffeeffed49a21f2b': Match language-specific flags before default locale country matches
| * Merge "Match language-specific flags before default locale country matches" ↵Tor Norbye2014-09-021-11/+12
| |\ | | | | | | | | | | | | | | | | | | | | | | | | into idea133 automerge: 1687a96 * commit '1687a96922879da90952b9f363380eb923ee700c': Match language-specific flags before default locale country matches
| | * Merge "Match language-specific flags before default locale country matches" ↵Tor Norbye2014-08-291-11/+12
| | |\ | | | | | | | | | | | | into idea133
| | | * Match language-specific flags before default locale country matchesTor Norbye2014-08-291-11/+12
| | |/ | | | | | | | | | | | | | | | Fixes issue 75173. Change-Id: Ic825a50664e2c6bae47499482ead8f60a3758787
* | | am 972e1c6d: Merge "emulator/opengl: Cleanup build files + remove obsolete ↵David 'Digit' Turner2014-08-2962-6756/+84
|\ \ \ | |/ / | | | | | | | | | | | | | | | tests." * commit '972e1c6d399e81b59fc07d7b7bdc77069ebac1c7': emulator/opengl: Cleanup build files + remove obsolete tests.
| * | Merge "emulator/opengl: Cleanup build files + remove obsolete tests."David 'Digit' Turner2014-08-2962-6756/+84
| |\ \ | | |/ | |/|
| | * emulator/opengl: Cleanup build files + remove obsolete tests.David 'Digit' Turner2014-08-2762-6756/+84
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch cleans up the build files for the GPU emulation libraries (i.e. there is no need to test for BUILD_EMULATOR_64BITS anymore, filtering is now handled by the build system directly). + Remove a bunch obsolete tests, which were not unit tests, despite their name beginning with ut_xxxx. Which includes removing dependency on SDL too. + Remove -m64 and -fPIC flags from compilation. These are not necessary anymore (again, the build system now takes charge of placing them when necessary), and generated link-time warning when building Windows executables. + Remove a few declarations related to the now-obsolete platform build (these libraries are only built with the emulator's build system now). Change-Id: I27c28979c42cd51f2fe9e30edd4141136e80ee03
* | am 956b01fd: Merge "gltrace: Increase launch timeout" into idea133 ↵Siva Velusamy2014-08-181-1/+1
|\ \ | |/ | | | | | | | | | | automerge: 1d55d41 * commit '956b01fd91a6a576e8c8e35b2d608408e866c5da': gltrace: Increase launch timeout
| * Merge "gltrace: Increase launch timeout" into idea133Siva Velusamy2014-08-181-1/+1
| |\ | | | | | | | | | | | | | | | | | | automerge: 1d55d41 * commit '1d55d413646dfc6f4d95e4f74a5bfdd7ed1c23cd': gltrace: Increase launch timeout
| | * Merge "gltrace: Increase launch timeout" into idea133Siva Velusamy2014-08-161-1/+1
| | |\
| | | * gltrace: Increase launch timeoutSiva Velusamy2014-08-181-1/+1
| | |/ | | | | | | | | | | | | | | | b/17106700 Change-Id: I584d546502535d5390ca7b24029205895ce97550
* | | am 39f4d677: Merge "Change Device List to Device Collection." into idea133 ↵Deepanshu Gupta2014-08-158-21/+27
|\ \ \ | |/ / | | | | | | | | | | | | | | | automerge: b0e06f6 * commit '39f4d6778f7597af9d416db62a677cce153cf84b': Change Device List to Device Collection.
| * | Merge "Change Device List to Device Collection." into idea133Deepanshu Gupta2014-08-158-21/+27
| |\ \ | | |/ | | | | | | | | | | | | | | | automerge: b0e06f6 * commit 'b0e06f6fcfc02a35f086367ccef8294b0f9376e3': Change Device List to Device Collection.
| | * Merge "Change Device List to Device Collection." into idea133Deepanshu Gupta2014-08-158-21/+27
| | |\
| | | * Change Device List to Device Collection.Deepanshu Gupta2014-08-158-21/+27
| | |/ | | | | | | | | | | | | | | | | | | sdklib now stores devices as LinkedHashSet. Change the List to a Collection so that it's agnostic of the underlying representation. Change-Id: I14a20d7fff6495c0d61c6f250a92cfe9210b50d9
* | | am 5131332b: Merge "gltrace: Increase TEXTURE_UNIT_COUNT and ↵Siva Velusamy2014-08-141-2/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | MAX_VERTEX_ATTRIBS" into idea133 automerge: 4d05f33 * commit '5131332bbb775729c337a4b6fc2ce87099b9177e': gltrace: Increase TEXTURE_UNIT_COUNT and MAX_VERTEX_ATTRIBS
| * | Merge "gltrace: Increase TEXTURE_UNIT_COUNT and MAX_VERTEX_ATTRIBS" into idea133Siva Velusamy2014-08-141-2/+2
| |\ \ | | |/ | | | | | | | | | | | | | | | automerge: 4d05f33 * commit '4d05f33f9ac64d5570e0ae841bcb33101a8f1ba3': gltrace: Increase TEXTURE_UNIT_COUNT and MAX_VERTEX_ATTRIBS
| | * Merge "gltrace: Increase TEXTURE_UNIT_COUNT and MAX_VERTEX_ATTRIBS" into idea133Siva Velusamy2014-08-141-2/+2
| | |\
| | | * gltrace: Increase TEXTURE_UNIT_COUNT and MAX_VERTEX_ATTRIBSSiva Velusamy2014-08-141-2/+2
| | |/ | | | | | | | | | | | | | | | | | | This is a short term workaround until the state information can be updated properly with actual values from the device. Change-Id: I4387613f320deb9a88d3810a81910f348c9839f6
* | | am 1af9ef83: Merge "Support dynamic lib name without ".dylib" on Mac"David Turner2014-07-283-4/+44
|\ \ \ | |/ / | | | | | | | | | * commit '1af9ef83f5f6c6fd9202d5bdd8d4248a4eb855aa': Support dynamic lib name without ".dylib" on Mac
| * | Merge "Support dynamic lib name without ".dylib" on Mac"David Turner2014-07-233-4/+44
| |\ \
| | * | Support dynamic lib name without ".dylib" on MacTina Zhang2014-07-273-4/+44
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | On Mac, some of the dynamic libs has name without ".dylib". Like, "System/Library/Frameworks/OpenGL.framework/OpenGL", we need solution to handle it in the dlopen() API. Change-Id: Ie513ace5a0d7d154f73e0f13919005d1498901d7 Signed-off-by: Tina Zhang <tina.zhang@intel.com> Signed-off-by: Chao Qin <chaox.qin@intel.com>
* | | am ec58e2e9: Merge "monitor: Move from sdk/ to sdk/eclipse" into idea133 ↵Siva Velusamy2014-07-234-4/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | automerge: f68260f * commit 'ec58e2e9626c5f4c5da339a77178d81c32fdb461': monitor: Move from sdk/ to sdk/eclipse
| * | Merge "monitor: Move from sdk/ to sdk/eclipse" into idea133Siva Velusamy2014-07-234-4/+2
| |\ \ | | |/ | | | | | | | | | | | | | | | automerge: f68260f * commit 'f68260f91fe2eee6687d6108eaff2d8f9319937d': monitor: Move from sdk/ to sdk/eclipse
| | * Merge "monitor: Move from sdk/ to sdk/eclipse" into idea133Siva Velusamy2014-07-234-4/+2
| | |\
| | | * monitor: Move from sdk/ to sdk/eclipseSiva Velusamy2014-07-234-4/+2
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | The monitor Gradle build script assumed that the version of monitor matches the tools. However, it really matches the version of the Eclipse plugins. This CL moves monitor into the eclipse folder so that the version updater script handles the version encoded inside monitor's build script. Change-Id: I31e70bfc705af00fbaacde417cf505740701038b
* | | am 0d29dd07: Merge "Merge commit \'ae461d3\' into mmerge"Siva Velusamy2014-07-234-239/+0
|\ \ \ | |/ / | | | | | | | | | * commit '0d29dd0774af2be7351f47b08fde4863d7c4820b': monitor: Remove old build scripts and instructions
| * | Merge "Merge commit 'ae461d3' into mmerge"Siva Velusamy2014-07-234-239/+0
| |\ \
| | * \ Merge commit 'ae461d3' into mmergeSiva Velusamy2014-07-234-239/+0
| | |\ \ | |/ / / | | | _ | | | | | | | | | | | | Conflicts: monitor/Android.mk Change-Id: Ibea7e6fba180f1527bcd97576ab4e00cda8625f3
| | * Merge "monitor: Remove old build scripts and instructions" into idea133Siva Velusamy2014-07-234-230/+0
| | |\
| | | * monitor: Remove old build scripts and instructionsSiva Velusamy2014-07-234-230/+0
| | |/ | | | | | | | | | Change-Id: Ieff81be1ef4ecf73de2c4946e7c21988bcac768d
* | | am 37075b01: Merge "Include JDT as a required dependency" into idea133 ↵Siva Velusamy2014-07-221-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | automerge: b282ba8 * commit '37075b0189976d74b018199af0c1a50f11b4f6d5': Include JDT as a required dependency
| * | Merge "Include JDT as a required dependency" into idea133Siva Velusamy2014-07-221-0/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | automerge: b282ba8 * commit 'b282ba8d3d00ea5cc9df539492f06ced394463f9': Include JDT as a required dependency
| | * Merge "Include JDT as a required dependency" into idea133Siva Velusamy2014-07-221-0/+1
| | |\
| | | * Include JDT as a required dependencySiva Velusamy2014-07-221-0/+1
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | JDT itself was included, but without this explicit requirement, the annotations processing (apt) plugins (org.eclipse.jdt.adt.*) weren't being installed. https://code.google.com/p/android/issues/detail?id=73798 Change-Id: Id097200c044cb840ea961bd51878a6b21a3026ca
* | | am 97c86dcf: Merge "Add NDK plugin to ADT package feature" into idea133 ↵Siva Velusamy2014-07-221-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | automerge: d4ce9eb * commit '97c86dcf5cce4580c01353e2be39a4f31dec79fd': Add NDK plugin to ADT package feature
| * | Merge "Add NDK plugin to ADT package feature" into idea133Siva Velusamy2014-07-221-0/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | automerge: d4ce9eb * commit 'd4ce9eb0eddd3faf21dbcc66c1764113f242d66b': Add NDK plugin to ADT package feature
| | * Merge "Add NDK plugin to ADT package feature" into idea133Siva Velusamy2014-07-221-0/+1
| | |\
| | | * Add NDK plugin to ADT package featureSiva Velusamy2014-07-211-0/+1
| | | | | | | | | | | | | | | | Change-Id: I9fe8bf7cc4e5a744d7e20357e48615fec38a5b19
* | | | am 4f8c939e: Merge "Update Eclipse plugins\' version from 23.0.2 -> 23.0.3" ↵Siva Velusamy2014-07-2252-76/+76
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | into idea133 automerge: 234cc6a * commit '4f8c939e96f898c70901ca7d13a1e9cb09232190': Update Eclipse plugins' version from 23.0.2 -> 23.0.3
| * | | Merge "Update Eclipse plugins\' version from 23.0.2 -> 23.0.3" into idea133Siva Velusamy2014-07-2252-76/+76
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | automerge: 234cc6a * commit '234cc6a9237ddd9ad29eaa04a9146051d9edf7f6': Update Eclipse plugins' version from 23.0.2 -> 23.0.3
| | * | Merge "Update Eclipse plugins' version from 23.0.2 -> 23.0.3" into idea133Siva Velusamy2014-07-2252-76/+76
| | |\ \ | | | |/
| | | * Update Eclipse plugins' version from 23.0.2 -> 23.0.3Siva Velusamy2014-07-2152-76/+76
| | |/ | | | | | | | | | Change-Id: I25f248244c588c36eeb92b4abb802a2877f3407b
* | | am f005a74c: Merge "Don\'t compress apks." into idea133 automerge: b6d2791Xavier Ducrohet2014-07-211-0/+4
|\ \ \ | |/ / | | | | | | | | | * commit 'f005a74c1b5cc7d98838eb59bbe6eea009925671': Don't compress apks.
| * | Merge "Don\'t compress apks." into idea133Xavier Ducrohet2014-07-211-0/+4
| |\ \ | | |/ | | | | | | | | | | | | | | | automerge: b6d2791 * commit 'b6d2791f11ce841f4a57f28ce2f411ab3016dc09': Don't compress apks.
| | * Merge "Don't compress apks." into idea133Xavier Ducrohet2014-07-201-0/+4
| | |\
| | | * Don't compress apks.Xavier Ducrohet2014-07-211-0/+4
| | | | | | | | | | | | | | | | Change-Id: I000bc2ef58c189b60148bd242d914b6cdae7df97
* | | | am ab18c6fb: Merge "Correct incorrect test for RenderScript support." into ↵Xavier Ducrohet2014-07-211-5/+5
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | idea133 automerge: 5afdda0 * commit 'ab18c6fb3cc51bb0ab18afe27ff343656bab1a13': Correct incorrect test for RenderScript support.
| * | | Merge "Correct incorrect test for RenderScript support." into idea133Xavier Ducrohet2014-07-211-5/+5
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | automerge: 5afdda0 * commit '5afdda0e90c1900d7f249985ddc09ed4a98ce053': Correct incorrect test for RenderScript support.
| | * | Merge "Correct incorrect test for RenderScript support." into idea133Xavier Ducrohet2014-07-171-5/+5
| | |\ \ | | | |/ | | |/|
generated by cgit v1.1 at 2025-02-03 13:38:49 +0000