Commit Graph

5020 Commits

Author SHA1 Message Date
David 'Digit' Turner
51bcfb7110 ndk: Add missing OpenSLES headers and libraries.
Change-Id: I5444f8701a2b8ad8e99fffc6906bad1bf101530f
2010-10-12 18:29:00 +02:00
David 'Digit' Turner
47cacaf625 am b53e3cac: am 3c72deb3: Merge "ndk: remove undefined symbols from system headers" into gingerbread
Merge commit 'b53e3cac405a25fb4d7fa267dd41737caa03628d'

* commit 'b53e3cac405a25fb4d7fa267dd41737caa03628d':
  ndk: remove undefined symbols from system headers
2010-10-11 18:59:22 -07:00
Kenny Root
d5e77d5e56 am 3ceb9b53: Merge "Update OBB sample to revised API" into gingerbread
Merge commit '3ceb9b53eab86a86d1817d344822bd16fbbc47fd' into gingerbread-plus-aosp

* commit '3ceb9b53eab86a86d1817d344822bd16fbbc47fd':
  Update OBB sample to revised API
2010-10-11 17:31:13 -07:00
Nick Kralevich
8b2b6a1730 cleanup unused classes, show date in tag list.
Change-Id: Ie9b1eee3606d7d1cfaff73723ff40c7570a6b1c9
2010-10-11 17:28:21 -07:00
Kenny Root
3ceb9b53ea Merge "Update OBB sample to revised API" into gingerbread 2010-10-11 17:28:20 -07:00
Nick Kralevich
045e0767be am 4a74a386: get rid of sql finalizer error messages.
Merge commit '4a74a386066d2eb86b64ffdf09391def0451e4be' into gingerbread-plus-aosp

* commit '4a74a386066d2eb86b64ffdf09391def0451e4be':
  get rid of sql finalizer error messages.
2010-10-11 17:26:33 -07:00
Nick Kralevich
3cd1530903 am 55fe78df: bytes should be a blob.
Merge commit '55fe78df445c72e2eebf1e07a704432b8b2c2f58' into gingerbread-plus-aosp

* commit '55fe78df445c72e2eebf1e07a704432b8b2c2f58':
  bytes should be a blob.
2010-10-11 17:25:55 -07:00
Kenny Root
a2f69539af Update OBB sample to revised API
Change-Id: Idc724170a9cbb6a94523b406b8a1f91fcf8293a4
2010-10-11 17:25:23 -07:00
Brett Chabot
a2e81242e0 Add utility for toggling settings from the cmd line.
Change-Id: I4dc7052c22fac3edf66e2d7db0c8d7039be4f196
2010-10-11 16:25:03 -07:00
Nick Kralevich
4a74a38606 get rid of sql finalizer error messages.
Change-Id: I5613734b78f861237b435079742528b9623c97de
2010-10-11 16:10:04 -07:00
Nick Kralevich
55fe78df44 bytes should be a blob.
Change-Id: I8bbf6aab8ec67d60cb6ac47cd273aec8814d2d6a
2010-10-11 15:22:58 -07:00
Joe Malin
390d67679c Samples: Fix bugs in Note Pad sample app.
Change-Id: I859cbc73eaaa77a9ff89484f33c7150d76a4e2c2
2010-10-11 09:13:32 -07:00
David 'Digit' Turner
b53e3cac40 am 3c72deb3: Merge "ndk: remove undefined symbols from system headers" into gingerbread
Merge commit '3c72deb3f4f087a3f7b8915301277b9e26b286e3' into gingerbread-plus-aosp

* commit '3c72deb3f4f087a3f7b8915301277b9e26b286e3':
  ndk: remove undefined symbols from system headers
2010-10-11 06:11:48 -07:00
David 'Digit' Turner
3c72deb3f4 Merge "ndk: remove undefined symbols from system headers" into gingerbread 2010-10-11 06:02:15 -07:00
Raphael
3fe7e69b2d am f838e2f4: am 59b02d0e: Update win_sdk to put binaries in SDK/platform-tools.
Merge commit 'f838e2f4e1d18b9a24fd9e6d524ce4c87e38fde4'

* commit 'f838e2f4e1d18b9a24fd9e6d524ce4c87e38fde4':
  Update win_sdk to put binaries in SDK/platform-tools.
2010-10-10 19:14:18 -07:00
Jean-Baptiste Queru
a4d6fb3907 am 4ceead6b: am e73f0dfc: Merge "Added adb_interface.WaitForProcess and WaitForProcessEnd."
Merge commit '4ceead6ba01a938499726809c90154cb0e8c1e22'

* commit '4ceead6ba01a938499726809c90154cb0e8c1e22':
  Added adb_interface.WaitForProcess and WaitForProcessEnd.
2010-10-10 17:46:49 -07:00
Jeff Brown
2559781424 am 7afd3a56: am 028c4032: Merge "Update NDK with recent changes." into gingerbread
Merge commit '7afd3a56c5801f4d30633c75b0aa7c148a562cf2'

* commit '7afd3a56c5801f4d30633c75b0aa7c148a562cf2':
  Update NDK with recent changes.
2010-10-10 17:45:41 -07:00
David 'Digit' Turner
baeabf2475 am 5a3dbcee: am 53c8d061: Merge "ndk: Update platform system libraries." into gingerbread
Merge commit '5a3dbceeb452487ef9328978140c07c4fc596291'

* commit '5a3dbceeb452487ef9328978140c07c4fc596291':
  ndk: Update platform system libraries.
2010-10-10 14:22:14 -07:00
Bill Napier
85c3f8e126 Add in MonkeyRunner to the Windows SDK.
Change-Id: Iecb23b5a2f790978246df9ab4a10cda884abf742
2010-10-10 13:34:38 -07:00
Ying Wang
14c0c1e4a0 am cbe0d5b9: resolved conflicts for merge of de14fbd4 to gingerbread-plus-aosp
Merge commit 'cbe0d5b963122c3cd0d7d2b8404c3bffd0b823fd'

* commit 'cbe0d5b963122c3cd0d7d2b8404c3bffd0b823fd':
  Set monkey process name
2010-10-10 12:49:17 -07:00
Raphael
f838e2f4e1 am 59b02d0e: Update win_sdk to put binaries in SDK/platform-tools.
Merge commit '59b02d0eff9fb11ea6607a90db3752fe76f250d5' into gingerbread-plus-aosp

* commit '59b02d0eff9fb11ea6607a90db3752fe76f250d5':
  Update win_sdk to put binaries in SDK/platform-tools.
2010-10-08 16:23:37 -07:00
Raphael
59b02d0eff Update win_sdk to put binaries in SDK/platform-tools.
Change-Id: I8fe9df75ceaf04aa1935341e51bf6f3edffae9e4
2010-10-08 15:41:01 -07:00
Jean-Baptiste Queru
4ceead6ba0 am e73f0dfc: Merge "Added adb_interface.WaitForProcess and WaitForProcessEnd."
Merge commit 'e73f0dfc64a55dcdcac92a2cab93de677042fb07' into gingerbread-plus-aosp

* commit 'e73f0dfc64a55dcdcac92a2cab93de677042fb07':
  Added adb_interface.WaitForProcess and WaitForProcessEnd.
2010-10-08 13:52:24 -07:00
Jean-Baptiste Queru
e73f0dfc64 Merge "Added adb_interface.WaitForProcess and WaitForProcessEnd." 2010-10-08 13:43:42 -07:00
Jeff Brown
7afd3a56c5 am 028c4032: Merge "Update NDK with recent changes." into gingerbread
Merge commit '028c403286aa08c7edb4b822e68121c694f52693' into gingerbread-plus-aosp

* commit '028c403286aa08c7edb4b822e68121c694f52693':
  Update NDK with recent changes.
2010-10-08 12:51:02 -07:00
Jeff Brown
028c403286 Merge "Update NDK with recent changes." into gingerbread 2010-10-08 12:45:05 -07:00
Patrick Scott
ed149c2dff Fix for building the sim on glucid.
Change-Id: I7c9df36c02591baa45bffb2da8e885813a3e3d86

Revert "Apparently wxImage::HasAlpha and wxMenuBase::AppendSeparator are"

This reverts commit fe524684fb.
2010-10-08 13:07:41 -04:00
David 'Digit' Turner
7c2ba504e9 ndk: remove undefined symbols from system headers
This change removes the declaration of functions that are not
implemented by our various versions of our C library.

The corresponding declarations are moved inside #if 0 .. #endif
blocks (so it becomes easy to remember that they are missing)

Also refresh the headers a little (i.e. adding a few missing decl
and macros, remove C++ comments, etc)

See http://code.google.com/p/android/issues/detail?id=7807

Change-Id: I4ae1b1f3a181419eee2004c41b54768cc15e896f
NOTE: The missing decl are still there but encased in #if 0 .. #endif
      blocks (to make it easier to implement them later). There are
      a few exceptions in order to build STLport and libstdc++-v3
      properly.
2010-10-08 17:07:39 +02:00
David 'Digit' Turner
5a3dbceeb4 am 53c8d061: Merge "ndk: Update platform system libraries." into gingerbread
Merge commit '53c8d0614f60ed488e9993d2dd0c6b5a0e49a2d0' into gingerbread-plus-aosp

* commit '53c8d0614f60ed488e9993d2dd0c6b5a0e49a2d0':
  ndk: Update platform system libraries.
2010-10-08 00:22:08 -07:00
David 'Digit' Turner
53c8d0614f Merge "ndk: Update platform system libraries." into gingerbread 2010-10-08 00:19:10 -07:00
Anatol Pomazau
0bb3e5ef33 am a3088c43: am 9f62c24a: Show \'Save tag\' dialog even if the screen is turned off
Merge commit 'a3088c433ed5deb775d390f2b22df40dc0194950'

* commit 'a3088c433ed5deb775d390f2b22df40dc0194950':
  Show 'Save tag' dialog even if the screen is turned off
2010-10-07 15:15:26 -07:00
Ying Wang
cbe0d5b963 resolved conflicts for merge of de14fbd4 to gingerbread-plus-aosp
Change-Id: I53302710ca0698daa5fe8ca3ce631a70d1578463
2010-10-07 14:59:03 -07:00
Jeff Brown
3ec1cec3b7 Update NDK with recent changes.
Includes bitmap.h which was missing from v9 but was previously in v8.
Also includes new obb stuff and other things that have gotten out of sync.

Change-Id: I6cf9ccdbc9d3271a34a1cf8a1de78aa8a1757276
2010-10-07 14:38:12 -07:00
Chet Haase
824bec0f9c Merge "Various fixes" 2010-10-07 13:18:52 -07:00
Ying Wang
de14fbd4b1 Set monkey process name
So you can find it easily with "ps" or "top".

Change-Id: Id52cb8bb1680bd2cc24043d08a94f0a304f1e436
2010-10-07 13:04:24 -07:00
Chet Haase
45d18599b8 Various fixes
Change-Id: I70509d19d1df01e998de4804bc7c1e1899ad8dee
2010-10-07 12:29:12 -07:00
Nick Kralevich
f5320adb18 am 1ce3c1d4: am ce6bbfae: More data for testing.
Merge commit '1ce3c1d4f75985edf490719bed33f583d74c4410'

* commit '1ce3c1d4f75985edf490719bed33f583d74c4410':
  More data for testing.
2010-10-07 12:23:23 -07:00
Anatol Pomazau
8fa797a472 am 78823862: am 64076440: Dismiss "Save" dialog on activity stop
Merge commit '78823862e69b65e999b221053076cafc099133e0'

* commit '78823862e69b65e999b221053076cafc099133e0':
  Dismiss "Save" dialog on activity stop
2010-10-07 12:23:06 -07:00
Nick Kralevich
2bb58e9f26 am ad7ed966: am 97d3699c: Have TagBroadcastReceiver start the SaveTag activity.
Merge commit 'ad7ed9662874ca57e9a17d334f973fada634654f'

* commit 'ad7ed9662874ca57e9a17d334f973fada634654f':
  Have TagBroadcastReceiver start the SaveTag activity.
2010-10-07 12:22:24 -07:00
Nick Kralevich
63eda94346 am 68220d58: am afad3fa1: new icon.
Merge commit '68220d5838c2039d6b1279587e4a2a45496c6f3a'

* commit '68220d5838c2039d6b1279587e4a2a45496c6f3a':
  new icon.
2010-10-07 12:19:53 -07:00
Nick Kralevich
f3d2517c05 am 4d5a6a6d: am 08ad0fde: Merge "new SaveTag activity, additional utilities" into gingerbread
Merge commit '4d5a6a6de3d86007d68a590d3893489cd740d179'

* commit '4d5a6a6de3d86007d68a590d3893489cd740d179':
  new SaveTag activity, additional utilities
2010-10-07 09:27:43 -07:00
David 'Digit' Turner
7c5623becb ndk: Update platform system libraries.
This change updates various system libraries to reflect changes that
happened during distinct platform releases. All details are in the
file bionic/libc/docs/CHANGES.TXT, but the summary is:

API level 5:
    pthread.h:
        pthread_mutex_lock_timeout_np()
        pthread_cond_timedwait_monotonic_np()
        pthread_cond_timedwait_relative_np()

API level 8:
    pthread.h:
        pthread_condattr_init()
        pthread_condattr_destroy()
        pthread_condattr_setpshared()
        pthread_condattr_getpshared()

    dlfcn.h:
        dladdr()

    sched.h:
        clone()

    signal.h:
        killpg()

    stdio.h:
        fdprintf()
        vfdprintf()

    unistd.h:
        getusershell()
        setusershell()
        endusershell()

    wchar.h:
        mbstowcs()
        wcstombs()

    time.h:
        timezone
        daylight

    plus symbols from new headers: <fts.h>, <regex.h>, <err.h>, <warn.h>

Change-Id: I7ff1ffa2cb37b71473b1d137c7799f17d644ab63
2010-10-07 11:17:39 +02:00
Marco Nelissen
c9448802a7 Merge "froyo == honeycomb" 2010-10-06 16:04:05 -07:00
Marco Nelissen
08cbad2818 Merge "Apparently wxImage::HasAlpha and wxMenuBase::AppendSeparator are not present (anymore?) in the wx2.6 .so, but gcc wants to use the exported functions instead of inlining them. Comment them out for now." 2010-10-06 16:03:56 -07:00
Marco Nelissen
47017b3b7f froyo == honeycomb
Change-Id: I449dfa5815b2a07237d2717f054755dc7edb7b82
2010-10-06 13:24:23 -07:00
Marco Nelissen
fe524684fb Apparently wxImage::HasAlpha and wxMenuBase::AppendSeparator are
not present (anymore?) in the wx2.6 .so, but gcc wants to use the
exported functions instead of inlining them. Comment them out for now.

Change-Id: I1b2385c48c77e23f9885f79092f69795a41afd8f
2010-10-06 13:20:12 -07:00
Dianne Hackborn
7d0913cdc2 Merge "Make note pad provider private, but able to grant URI permissions." 2010-10-05 17:55:25 -07:00
Anatol Pomazau
a3088c433e am 9f62c24a: Show \'Save tag\' dialog even if the screen is turned off
Merge commit '9f62c24a68e5408e5792fb185ab2e58d0c507265' into gingerbread-plus-aosp

* commit '9f62c24a68e5408e5792fb185ab2e58d0c507265':
  Show 'Save tag' dialog even if the screen is turned off
2010-10-05 17:50:43 -07:00
Anatol Pomazau
9f62c24a68 Show 'Save tag' dialog even if the screen is turned off
Change-Id: I7d8b2fa74525e81db1743bf3e4283778192fc047
2010-10-05 17:43:18 -07:00
Nick Kralevich
1ce3c1d4f7 am ce6bbfae: More data for testing.
Merge commit 'ce6bbfae018b5629fd86c77b81fc4d8c655fa275' into gingerbread-plus-aosp

* commit 'ce6bbfae018b5629fd86c77b81fc4d8c655fa275':
  More data for testing.
2010-10-05 16:48:56 -07:00