Commit Graph

1771 Commits

Author SHA1 Message Date
Android (Google) Code Review
4568cf1ba4 am 8136f161: Merge change 8885 into donut
Merge commit '8136f1611207c1bb120d7863dda1a6655a1d52be'

* commit '8136f1611207c1bb120d7863dda1a6655a1d52be':
  Add notice file to platform folder.
2009-07-29 14:47:45 -07:00
David 'Digit' Turner
eee1675aa4 Look for Android.mk in $(APP_PROJECT_PATH)/jni by default.
This gets rid of the 'sources' directory and allows all sources
of a given Android application to be in the same directory tree
without using a symlink trick.

Note that apps/<name>/Application.mk is still required though.
A later release of the NDK will get rid of it too, but the change
is too drastic for the upcoming release.

The change moves various source files from sources into their
app/<name>/project/jni directory as well.

The whole documentation is updated to reflect the change.
2009-07-29 19:04:44 +02:00
David 'Digit' Turner
197a8fea8e Add sample "san-angeles" program to demo OpenGL ES from native code.
Note that the app will only build against an android-4 SDK.
(Interestingly, the resulting binary runs very well under android-3).

This also adds missing license headers to the 'two-libs' sample.
2009-07-29 19:02:21 +02:00
David 'Digit' Turner
d7e5aaecd8 Add OpenGL ES headers to the android-4 platform/stable APIs. 2009-07-29 02:26:47 +02:00
David 'Digit' Turner
5c767bb977 Add android-4 sysroot and use project's default.properties to get the right target.
Note that for now, android-4 contains the same things than android-3.
Another patch will add OpenGL ES headers and libraries to it.
2009-07-29 02:26:31 +02:00
Xavier Ducrohet
91e0a8bb9c Fix minor typo and duplicated entry in sdk.atree 2009-07-28 16:28:09 -07:00
Android (Google) Code Review
8136f16112 Merge change 8885 into donut
* changes:
  Add notice file to platform folder.
2009-07-28 16:20:13 -07:00
Xavier Ducrohet
b519db4eed Add notice file to platform folder. 2009-07-28 16:19:23 -07:00
Android (Google) Code Review
21b5e35e33 am 807e5c32: Merge change 8637 into donut
Merge commit '807e5c325d92af5950a65ef1baeb74788abc99af'

* commit '807e5c325d92af5950a65ef1baeb74788abc99af':
  Add host check for nawk/gawk in build/host-setup.sh
2009-07-28 15:27:31 -07:00
Android (Google) Code Review
d06d004ff8 am 01aee823: Merge change 8623 into donut
Merge commit '01aee823d050d8a2f370fb429b5c0407b3d0f28f'

* commit '01aee823d050d8a2f370fb429b5c0407b3d0f28f':
  Add a "unit-tests" sample application to perform unit testing.
2009-07-28 15:27:29 -07:00
Android (Google) Code Review
233067b939 am 3f3d6b85: Merge change 8622 into donut
Merge commit '3f3d6b85a038e1b54a53a1cdb4aca62995cf1cf7'

* commit '3f3d6b85a038e1b54a53a1cdb4aca62995cf1cf7':
  Fix LOCAL_CFLAGS/CPPFLAGS handling to match full Android build system.
2009-07-28 15:27:27 -07:00
vchtchetkine
d344a6f6f4 am 39164844: Add classes encapsulatinglegacy USB API
Merge commit '39164844f16c2c63d52a71652d53b233c5f28e14'

* commit '39164844f16c2c63d52a71652d53b233c5f28e14':
  Add classes encapsulatinglegacy USB API
2009-07-28 15:27:16 -07:00
Android (Google) Code Review
807e5c325d Merge change 8637 into donut
* changes:
  Add host check for nawk/gawk in build/host-setup.sh
2009-07-28 15:00:12 -07:00
Android (Google) Code Review
01aee823d0 Merge change 8623 into donut
* changes:
  Add a "unit-tests" sample application to perform unit testing.
2009-07-28 15:00:00 -07:00
Android (Google) Code Review
3f3d6b85a0 Merge change 8622 into donut
* changes:
  Fix LOCAL_CFLAGS/CPPFLAGS handling to match full Android build system.
2009-07-28 14:59:44 -07:00
vchtchetkine
39164844f1 Add classes encapsulatinglegacy USB API
Added implementation for endpoints and overlapped I/O support for legacy API support.
2009-07-28 13:09:51 -07:00
Android (Google) Code Review
e3cb302f80 Merge change 8821
* changes:
  adding touch support to the paint plugin.
2009-07-28 12:17:31 -07:00
Derek Sollenberger
b6f5cd2d77 adding touch support to the paint plugin. 2009-07-28 15:09:23 -04:00
Android (Google) Code Review
29bbe87153 am 743b376b: Merge change 8804 into donut
Merge commit '743b376b363f85b6109828e5c33857316d263468'

* commit '743b376b363f85b6109828e5c33857316d263468':
  Fix SDK build break caused by including legacy support header into main API header
2009-07-28 11:29:20 -07:00
Android (Google) Code Review
743b376b36 Merge change 8804 into donut
* changes:
  Fix SDK build break caused by including legacy support header into main API header
2009-07-28 11:00:39 -07:00
vchtchetkine
59fc68ba26 Fix SDK build break caused by including legacy support header into main API header
usb_windows.c doesn't build with adb_legacy_api.h included into adb_api.h
Since adb_legacy_api.h is not used anywhere outside AdbWinApi.dll project, the simplest
fix would be to remove its inclusion from adb_api.h
2009-07-28 10:07:09 -07:00
Android (Google) Code Review
ad7f209ac6 Merge change 8676
* changes:
  adding first pass of a sample paint plugin based on surface views.
2009-07-28 05:08:04 -07:00
Android (Google) Code Review
86fe98448c am d43d1801: Merge change 7938 into donut
Merge commit 'd43d18015e1a9992bfe746016a1f8be2f3bd904f'

* commit 'd43d18015e1a9992bfe746016a1f8be2f3bd904f':
  New ntro image for camera.html that shows flow for video capture.
2009-07-27 18:42:41 -07:00
Xavier Ducrohet
8ec5702f75 am c5b9a676: Prevent SDK Updater progress dialog from showing off screen.
Merge commit 'c5b9a676e7d649c2b499e15bd0d033fec1dc775f'

* commit 'c5b9a676e7d649c2b499e15bd0d033fec1dc775f':
  Prevent SDK Updater progress dialog from showing off screen.
2009-07-27 18:42:34 -07:00
Android (Google) Code Review
d43d18015e Merge change 7938 into donut
* changes:
  New ntro image for camera.html that shows flow for video capture.
2009-07-27 16:25:47 -07:00
Xavier Ducrohet
c5b9a676e7 Prevent SDK Updater progress dialog from showing off screen. 2009-07-27 15:39:42 -07:00
Android (Google) Code Review
d8cefaf87a am e30e98f8: Merge change 8699 into donut
Merge commit 'e30e98f82189386dbf603750f37f3bc8a6078a22'

* commit 'e30e98f82189386dbf603750f37f3bc8a6078a22':
  Prevent SDK updater dialog from showing offscreen.
2009-07-27 15:28:27 -07:00
Android (Google) Code Review
e30e98f821 Merge change 8699 into donut
* changes:
  Prevent SDK updater dialog from showing offscreen.
2009-07-27 15:26:38 -07:00
Xavier Ducrohet
bc8b16505e Prevent SDK updater dialog from showing offscreen. 2009-07-27 15:26:10 -07:00
Android (Google) Code Review
72093503c8 Merge change 8685
* changes:
  Add keymaps for STOP and FASTFORWARD for bluez4.
2009-07-27 14:46:22 -07:00
Jaikumar Ganesh
c36dc84caf Add keymaps for STOP and FASTFORWARD for bluez4. 2009-07-27 14:37:27 -07:00
Derek Sollenberger
4fb83e6fa2 adding first pass of a sample paint plugin based on surface views. 2009-07-27 16:40:13 -04:00
Android (Google) Code Review
96b96c08e9 am 84c6ef89: Merge change 8516 into donut
Merge commit '84c6ef89468a8753dfb4b87f203c800c199c7bd0'

* commit '84c6ef89468a8753dfb4b87f203c800c199c7bd0':
  Refactor API classes to support both, WinUsb and Legacy API
2009-07-27 11:45:49 -07:00
Android (Google) Code Review
84c6ef8946 Merge change 8516 into donut
* changes:
  Refactor API classes to support both, WinUsb and Legacy API
2009-07-27 11:43:49 -07:00
David 'Digit' Turner
73aaee4171 Add host check for nawk/gawk in build/host-setup.sh
Store the result as HOST_AWK in out/host/config.mk
2009-07-27 15:47:09 +02:00
David 'Digit' Turner
4ddb7840c2 Add a "unit-tests" sample application to perform unit testing. 2009-07-27 12:26:17 +02:00
David 'Digit' Turner
747294cc4a Fix LOCAL_CFLAGS/CPPFLAGS handling to match full Android build system.
Also improve BUILD_SYSTEM directory detection logic in build/core/main.mk
2009-07-27 12:24:58 +02:00
Jean-Baptiste Queru
d4966cae1d reconcile korg/master into goog/master 2009-07-26 11:43:54 -07:00
Jean-Baptiste Queru
1972851d20 Merge korg/donut into korg/master
Conflicts:

	tools/eclipse/plugins/README.txt
	tools/sdkmanager/libs/sdklib/src/com/android/sdklib/avd/AvdManager.java
2009-07-25 17:25:52 -07:00
vchtchetkine
8267511c96 Refactor API classes to support both, WinUsb and Legacy API
To support both, WinUsb and Legacy driver APIs we need to abstract classes
that depend on driver API details and then implement two sets of the
actual classes: one for WinUsb, and another for the Legacy drivers, so
we can choose in runtime which objects should be instantiated, depending
on what type of driver we have underneath this API.
2009-07-25 11:14:04 -07:00
Android (Google) Code Review
6791ce457f am 1ff4f596: Merge change 8502 into donut
Merge commit '1ff4f596bfe608b26656f1e854f1a5504877bdaa'

* commit '1ff4f596bfe608b26656f1e854f1a5504877bdaa':
  Rename ndk/build/platforms/android-1.5 into android-3 to match API levels
2009-07-25 10:10:27 -07:00
Android (Google) Code Review
fd535d1acb am e8c0bd07: Merge change 8501 into donut
Merge commit 'e8c0bd070c2d7d3987f188b520b36cbdfa22399b'

* commit 'e8c0bd070c2d7d3987f188b520b36cbdfa22399b':
  Handle LOCAL_CPPFLAGS/CFLAGS/CXXFLAGS as claimed by the documentation.
2009-07-25 10:10:25 -07:00
Xavier Ducrohet
9c537d0fd5 am 6675fec4: First pass at a WVGA skin.
Merge commit '6675fec474d86d77947cf68d47dd36e9744b9f14'

* commit '6675fec474d86d77947cf68d47dd36e9744b9f14':
  First pass at a WVGA skin.
2009-07-25 10:10:22 -07:00
Xavier Ducrohet
821c288575 am e0f85e6c: Delete non rotating skins and create a QVGA rotating skin.
Merge commit 'e0f85e6c7379c053cd3ece5bdd934337ff66cd45'

* commit 'e0f85e6c7379c053cd3ece5bdd934337ff66cd45':
  Delete non rotating skins and create a QVGA rotating skin.
2009-07-25 10:10:20 -07:00
Xavier Ducrohet
f94f24b654 am 510248e2: Add Apache Commons Compress to ADT (required by sdklib)
Merge commit '510248e2e138cd5990126371307df5f0dccd3c72'

* commit '510248e2e138cd5990126371307df5f0dccd3c72':
  Add Apache Commons Compress to ADT (required by sdklib)
2009-07-25 10:10:17 -07:00
Android (Google) Code Review
1ff4f596bf Merge change 8502 into donut
* changes:
  Rename ndk/build/platforms/android-1.5 into android-3 to match API levels
2009-07-25 09:10:50 -07:00
Android (Google) Code Review
e8c0bd070c Merge change 8501 into donut
* changes:
  Handle LOCAL_CPPFLAGS/CFLAGS/CXXFLAGS as claimed by the documentation.
2009-07-25 09:10:27 -07:00
Xavier Ducrohet
6675fec474 First pass at a WVGA skin. 2009-07-24 19:23:23 -07:00
Xavier Ducrohet
e0f85e6c73 Delete non rotating skins and create a QVGA rotating skin.
HVGA-P and HVGA-L were redundant with HVGA which supports both orientations.
QVGA-P and QVGA-L has been replaced with QVGA which supports both orientations.
2009-07-24 18:06:05 -07:00
Dianne Hackborn
676902e287 Deal with canceled keys. 2009-07-24 17:30:00 -07:00