Merge commit 'd7e5aaecd896c0956e229304a7725509ab6e6af9'
* commit 'd7e5aaecd896c0956e229304a7725509ab6e6af9':
Add OpenGL ES headers to the android-4 platform/stable APIs.
Merge commit '5c767bb977506dae81680529044adc9f82b4765a'
* commit '5c767bb977506dae81680529044adc9f82b4765a':
Add android-4 sysroot and use project's default.properties to get the right target.
The primary usage for this code is to provide vendors / customers who for some
reasons are not satisfied with WinUsb, with a sample custom driver code that is
compliant with our AdbWinApi.dll. So vendors / customers can build their own
custom USB driver that can be recognized by AdbWinApi, and can be accessible from
adb.exe
Merge commit '91e0a8bb9cc1e1478bf65627dc4faeb82ee3825d'
* commit '91e0a8bb9cc1e1478bf65627dc4faeb82ee3825d':
Fix minor typo and duplicated entry in sdk.atree
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.
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.
Merge commit '01aee823d050d8a2f370fb429b5c0407b3d0f28f'
* commit '01aee823d050d8a2f370fb429b5c0407b3d0f28f':
Add a "unit-tests" sample application to perform unit testing.
Merge commit '3f3d6b85a038e1b54a53a1cdb4aca62995cf1cf7'
* commit '3f3d6b85a038e1b54a53a1cdb4aca62995cf1cf7':
Fix LOCAL_CFLAGS/CPPFLAGS handling to match full Android build system.
Merge commit '743b376b363f85b6109828e5c33857316d263468'
* commit '743b376b363f85b6109828e5c33857316d263468':
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
Merge commit 'd43d18015e1a9992bfe746016a1f8be2f3bd904f'
* commit 'd43d18015e1a9992bfe746016a1f8be2f3bd904f':
New ntro image for camera.html that shows flow for video capture.
Merge commit '84c6ef89468a8753dfb4b87f203c800c199c7bd0'
* commit '84c6ef89468a8753dfb4b87f203c800c199c7bd0':
Refactor API classes to support both, WinUsb and Legacy API
