summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-07-11Remove the simulator target from all makefiles.HEADandroid-sdk-adt_r20android-sdk-adt_r16.0.1android-sdk-4.0.3_r1android-sdk-4.0.3-tools_r1android-cts-verifier-4.0_r1android-cts-verifier-4.0.3_r1android-cts-4.1_r4android-cts-4.1_r2android-cts-4.1_r1android-cts-4.0_r1android-cts-4.0.3_r2android-cts-4.0.3_r1android-4.1_pre2android-4.1_pre1android-4.1.2_r2.1android-4.1.2_r2android-4.1.2_r1android-4.1.1_r6.1android-4.1.1_r6android-4.1.1_r5android-4.1.1_r4android-4.1.1_r3android-4.1.1_r2android-4.1.1_r1.1android-4.1.1_r1android-4.1-sdk_pre1android-4.0.4_r2.1android-4.0.4_r2android-4.0.4_r1.2android-4.0.4_r1.1android-4.0.4_r1android-4.0.4-aah_r1android-4.0.3_r1.1android-4.0.3_r1android-4.0.2_r1android-4.0.1_r1.2android-4.0.1_r1.1android-4.0.1_r1android-3.2.6_r1tools_r21tools_r20mastermainjb-releasejb-mr0-releasejb-devics-plus-aospics-mr1-releaseics-mr1ics-mr0-releaseics-mr0ics-factoryrom-2-releaseics-aah-releaseemu-30-releaseemu-29.0-releaseaosp-emu-30-releaseJeff Brown
Bug: 5010576 Change-Id: I4eae2f4b9063a49878d2da2ff26af2f551117b12
2011-05-11am 5db288c5: (-s ours) am 4e1e20f5: (-s ours) Fix build - don\'t prelink ↵Jean-Baptiste Queru
glib - do not merge * commit '5db288c5e9f8969c7eabeb5b22187ae8d6618fdf': Fix build - don't prelink glib - do not merge
2011-05-10am 4e1e20f5: (-s ours) Fix build - don\'t prelink glib - do not mergeJean-Baptiste Queru
* commit '4e1e20f508d5a4deff8854cc9f54251f1facad81': Fix build - don't prelink glib - do not merge
2011-05-06Fix build - don't prelink glib - do not mergeandroid-sdk-tools_r12android-sdk-adt_r12Jean-Baptiste Queru
Change-Id: I34f96f8a4d0285dbea2cb056c49334d8e80a4dd5
2011-03-21Add gqueue to glib as the new Bluez version needs it.Jaikumar Ganesh
Change-Id: I5ff8dc26987ed6b078509a58ea98f084c851c242
2011-02-10am b7ea0d41: (-s ours) am 16a8c02e: (-s ours) am 2e9a8b3e: (-s ours) Merge ↵android-sdk-3.1_r1android-3.2_r1android-3.2.4_r1android-3.2.2_r2android-3.2.2_r1android-3.2.1_r2android-3.2.1_r1android-3.1_r1Jean-Baptiste Queru
"disable prelinking - do not merge" * commit 'b7ea0d41e1739f610d1e7bd8e7eb2fe600196a4c': disable prelinking - do not merge
2011-02-10am 85b7b818: (-s ours) am adb14248: (-s ours) Fix build - don\'t prelink ↵Jean-Baptiste Queru
glib - do not merge * commit '85b7b818d1cd9c82d0b951aabc9242c5749a019e': Fix build - don't prelink glib - do not merge
2011-02-10am 16a8c02e: (-s ours) am 2e9a8b3e: (-s ours) Merge "disable prelinking - do ↵Jean-Baptiste Queru
not merge" * commit '16a8c02e35da2cf8adf1a7d304a9f53851a7b151': disable prelinking - do not merge
2011-02-09am 2e9a8b3e: (-s ours) Merge "disable prelinking - do not merge"Jean-Baptiste Queru
* commit '2e9a8b3eb3835bfdb809c0e0f420e43ace7e3a35': disable prelinking - do not merge
2011-02-09Merge "disable prelinking - do not merge"Jean-Baptiste Queru
2011-02-09disable prelinking - do not mergeJean-Baptiste Queru
Change-Id: I2b847fcd89046390fe54295f5b8fb2b1c77c2cdd
2011-01-31am adb14248: (-s ours) Fix build - don\'t prelink glib - do not mergeJean-Baptiste Queru
* commit 'adb14248ea2a0e60a5a8bb0ff1adac2fde2a3c46': Fix build - don't prelink glib - do not merge
2011-01-31Fix build - don't prelink glib - do not mergeJean-Baptiste Queru
Change-Id: I6b98022ddc8710e1cb65ba7c4cca114ffd14c4a4
2010-08-30am 0c01eb3a: (-s ours) DO NOT MERGE Reverse meaning of ANDROID_STUB C flag.android-sdk-3.0_r1android-sdk-3.0-preandroid-3.0_r1.3android-3.0_r1.2android-3.0_r1.1android-3.0_r1Jaikumar Ganesh
Merge commit '0c01eb3a7313a580fe34044bcdc3337d067c8a15' * commit '0c01eb3a7313a580fe34044bcdc3337d067c8a15': DO NOT MERGE Reverse meaning of ANDROID_STUB C flag.
2010-08-30DO NOT MERGE Reverse meaning of ANDROID_STUB C flag.android-sdk-2.3.4_r1android-cts-2.3_r5android-cts-2.3_r4android-cts-2.3_r3android-cts-2.3_r2android-cts-2.3_r12android-cts-2.3_r11android-cts-2.3_r10android-cts-2.3_r1android-2.3_r1android-2.3.7_r1android-2.3.6_r1android-2.3.6_r0.9android-2.3.5_r1android-2.3.4_r1android-2.3.4_r0.9android-2.3.3_r1aandroid-2.3.3_r1.1android-2.3.3_r1android-2.3.2_r1android-2.3.1_r1gingerbread-releasegingerbread-mr4-releasegingerbreadJaikumar Ganesh
Also add defaults so that bluetoothd doesn't crash. Change-Id: I263cfecff6889ce0530b31b98277df04dd270fb5
2010-08-27Reverse meaning of ANDROID_STUB C flag.Jaikumar Ganesh
Also add defaults so that bluetoothd doesn't crash. Change-Id: Icd6efbdc7522ea8e92bf7ac8803b136b5d41b8ca
2010-08-13changed libglib to be a shared libraryDanica Chang
Change-Id: I1f76c23c6a1e18b0d5d898a4fb56c21095e6c8d6
2010-03-08Add an empty CleanSpec.mkandroid-sdk-tools_r7android-sdk-tools_r6android-sdk-2.2_r2android-sdk-2.2_r1android-cts-2.2_r8android-cts-2.2_r7android-cts-2.2_r6android-cts-2.2_r5android-cts-2.2_r4android-cts-2.2_r3android-cts-2.2_r2android-cts-2.2_r1android-adt-0.9.9android-adt-0.9.8android-2.2_r1.3android-2.2_r1.2android-2.2_r1.1android-2.2_r1android-2.2.3_r2.1android-2.2.3_r2android-2.2.3_r1android-2.2.2_r1android-2.2.1_r2android-2.2.1_r1tools_r9tools_r8tools_r7froyo-releasefroyo-plus-aospfroyoJean-Baptiste Queru
Change-Id: I3a6a51e485c151c30a5e8f1066a875beaa90d6c3
2010-02-05am 2fbf97b3: am 572f793b: reconcile main tree with open-source eclairThe Android Open Source Project
Merge commit '2fbf97b3b53a12583acb161e8df8aa5f1105d2d6' * commit '2fbf97b3b53a12583acb161e8df8aa5f1105d2d6': android-2.1_r1 snapshot
2010-02-05am 572f793b: reconcile main tree with open-source eclairThe Android Open Source Project
Merge commit '572f793bcdcae936229709941bb3af46473af159' into eclair-plus-aosp * commit '572f793bcdcae936229709941bb3af46473af159': android-2.1_r1 snapshot
2010-02-05reconcile main tree with open-source eclairandroid-sdk-tools_r5android-cts-2.1_r5android-cts-2.1_r4android-cts-2.1_r3android-cts-2.1_r2eclairThe Android Open Source Project
2010-01-29reconcile android-2.1_r1 snapshotThe Android Open Source Project
2010-01-12android-2.1_r1 snapshotThe Android Open Source Project
2009-11-15merge from open-source masterJean-Baptiste Queru
2009-11-15merge from open-source masterJean-Baptiste Queru
Merge commit 'goog/stage-korg-master' into HEAD
2009-11-15merge from open-source masterJean-Baptiste Queru
2009-11-12eclair snapshotJean-Baptiste Queru
2009-06-05Modify .gitignore file and add some header files.android-sdk-tools_r4android-sdk-tools_r3android-sdk-2.1_r1android-sdk-2.0_r1android-sdk-2.0.1_r1android-sdk-2.0.1-docs_r1android-2.1_r2.1sandroid-2.1_r2.1p2android-2.1_r2.1pandroid-2.1_r2android-2.1_r1android-2.0_r1android-2.0.1_r1eclair-sholes-release2eclair-sholes-releaseeclair-releaseeclair-passion-releaseJaikumar Ganesh
Some configuration files were being ignored by .gitignore.
2009-06-04Android specific changes.Jaikumar Ganesh
Added Android.mk fies, delete files.
2009-05-292.20.3upstream/2.20.3Matthias Clasen
2009-05-29Update for 2.20.3Matthias Clasen
2009-05-29Fix a locking problem in g_main_context_iterate()Matthias Clasen
We failed to ensure that the context is locked on every exit of the function. This fixes bug 583324.
2009-05-29Don't dereference identifier_type if it is NULL (#579558)Alexander Larsson
2009-05-29Take a reference on the gio file monitors while signaling pending file changesRobert Bragg
It was possible for a signal handler to remove the last reference and dispose the monitor. If there were remaining pending_file_changes they tried to dereference the disposed monitor. This patch simply calls g_object_{ref,unref} around the loop that signals the changes.
2009-05-29Preserve errno when using g_set_error with _() and g_strerror()Christian Persch
2009-05-28Fix string length bugs in GWinHttpFile (#580347)Shixin Zeng
2009-05-27Correct reference and implement close_fn (#578769)Hans Breuer
Do proper referencing and unreferencing of GWinHttpFileInputStream::file and GWinHttpFileInputStream::file::vfs. Implement GWinHttpFileInputStream::close_fn.
2009-05-25Added Valencian-Catalan translationMiquel Esplà
2009-05-17Forgotten commitMatthias Clasen
2009-05-16Bump versionMatthias Clasen
2009-05-16Update for 2.20.2upstream/2.20.2Matthias Clasen
2009-05-16Don't try to ref NULL pointer in g_desktop_app_info_dup()Paul Pogonyshev
Fixes bug #573246.
2009-05-03Updated Czech translationPetr Kovar
2009-04-26Minor fixes to Catalan translationJordi Mas i Hernandez
2009-04-22Fix translation from GIO's file attr to xattr attributesJohan Bilien
Bug 579862 – requesting xattr::foo ends up calling getxattr(..., user.:foo,...) The patch makes sure we escape xattr::, not xattr:, before adding user. and calling getxattr.
2009-04-17Pashto Translation committed as per the request made by Zabeeh Khan on the ↵zabeeh khan
gnome-i18n list
2009-04-11Bump versionMatthias Clasen
2009-04-09Add a note about handling non-hal backendsMatthias Clasen
2009-04-09Release GLib 2.20.1upstream/2.20.1Matthias Clasen
2009-04-09Update for 2.20.1Matthias Clasen